You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2013/11/26 22:08:20 UTC
svn commit: r1545839 [2/5] - in /commons/proper/imaging/trunk/src:
main/java/org/apache/commons/imaging/
main/java/org/apache/commons/imaging/common/
main/java/org/apache/commons/imaging/common/bytesource/
main/java/org/apache/commons/imaging/common/my...
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java Tue Nov 26 21:08:17 2013
@@ -50,8 +50,8 @@ import org.apache.commons.imaging.util.I
public class GifImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".gif";
- private static final String ACCEPTED_EXTENSIONS[] = { DEFAULT_EXTENSION, };
- private static final byte GIF_HEADER_SIGNATURE[] = { 71, 73, 70 };
+ private static final String[] ACCEPTED_EXTENSIONS = { DEFAULT_EXTENSION, };
+ private static final byte[] GIF_HEADER_SIGNATURE = { 71, 73, 70 };
private final static int EXTENSION_CODE = 0x21;
private final static int IMAGE_SEPARATOR = 0x2C;
private final static int GRAPHIC_CONTROL_EXTENSION = (EXTENSION_CODE << 8) | 0xf9;
@@ -65,7 +65,7 @@ public class GifImageParser extends Imag
private static final int LOCAL_COLOR_TABLE_FLAG_MASK = 1 << 7;
private static final int INTERLACE_FLAG_MASK = 1 << 6;
private static final int SORT_FLAG_MASK = 1 << 5;
- private static final byte XMP_APPLICATION_ID_AND_AUTH_CODE[] = {
+ private static final byte[] XMP_APPLICATION_ID_AND_AUTH_CODE = {
0x58, // X
0x4D, // M
0x50, // P
@@ -218,7 +218,7 @@ public class GifImageParser extends Imag
}
protected GenericGifBlock readGenericGIFBlock(final InputStream is, final int code,
- final byte first[]) throws IOException {
+ final byte[] first) throws IOException {
final List<byte[]> subblocks = new ArrayList<byte[]>();
if (first != null) {
@@ -226,7 +226,7 @@ public class GifImageParser extends Imag
}
while (true) {
- final byte bytes[] = readSubBlock(is);
+ final byte[] bytes = readSubBlock(is);
if (bytes.length < 1) {
break;
}
@@ -281,7 +281,7 @@ public class GifImageParser extends Imag
case APPLICATION_EXTENSION_LABEL: // 255 (hex 0xFF) Application
// Extension Label
{
- final byte label[] = readSubBlock(is);
+ final byte[] label = readSubBlock(is);
if (formatCompliance != null) {
formatCompliance.addComment(
@@ -378,17 +378,17 @@ public class GifImageParser extends Imag
+ SizeofLocalColorTable);
}
- byte LocalColorTable[] = null;
+ byte[] localColorTable = null;
if (LocalColorTableFlag) {
- LocalColorTable = readColorTable(is, SizeofLocalColorTable);
+ localColorTable = readColorTable(is, SizeofLocalColorTable);
}
- byte imageData[] = null;
+ byte[] imageData = null;
if (!stopBeforeImageData) {
final int LZWMinimumCodeSize = is.read();
final GenericGifBlock block = readGenericGIFBlock(is, -1);
- final byte bytes[] = block.appendSubBlocks();
+ final byte[] bytes = block.appendSubBlocks();
final InputStream bais = new ByteArrayInputStream(bytes);
final int size = imageWidth * imageHeight;
@@ -407,7 +407,7 @@ public class GifImageParser extends Imag
return new ImageDescriptor(blockCode,
ImageLeftPosition, ImageTopPosition, imageWidth, imageHeight,
PackedFields, LocalColorTableFlag, InterlaceFlag, SortFlag,
- SizeofLocalColorTable, LocalColorTable, imageData);
+ SizeofLocalColorTable, localColorTable, imageData);
}
private int simple_pow(final int base, final int power) {
@@ -455,7 +455,7 @@ public class GifImageParser extends Imag
final GifHeaderInfo ghi = readHeader(is, formatCompliance);
- byte globalColorTable[] = null;
+ byte[] globalColorTable = null;
if (ghi.globalColorTableFlag) {
globalColorTable = readColorTable(is,
ghi.sizeOfGlobalColorTable);
@@ -505,12 +505,12 @@ public class GifImageParser extends Imag
return new Dimension(id.imageWidth, id.imageHeight);
}
- public byte[] embedICCProfile(final byte image[], final byte profile[]) {
+ public byte[] embedICCProfile(final byte[] image, final byte[] profile) {
return null;
}
@Override
- public boolean embedICCProfile(final File src, final File dst, final byte profile[]) {
+ public boolean embedICCProfile(final File src, final File dst, final byte[] profile) {
return false;
}
@@ -526,7 +526,7 @@ public class GifImageParser extends Imag
for (GifBlock block : blocks) {
if (block.blockCode == code) {
- final byte bytes[] = ((GenericGifBlock) block).appendSubBlocks();
+ final byte[] bytes = ((GenericGifBlock) block).appendSubBlocks();
result.add(new String(bytes, "US-ASCII"));
}
}
@@ -624,14 +624,14 @@ public class GifImageParser extends Imag
return true;
}
- private int[] getColorTable(final byte bytes[]) throws ImageReadException {
+ private int[] getColorTable(final byte[] bytes) throws ImageReadException {
if ((bytes.length % 3) != 0) {
throw new ImageReadException("Bad Color Table Length: "
+ bytes.length);
}
final int length = bytes.length / 3;
- final int result[] = new int[length];
+ final int[] result = new int[length];
for (int i = 0; i < length; i++) {
final int red = 0xff & bytes[(i * 3) + 0];
@@ -693,7 +693,7 @@ public class GifImageParser extends Imag
final ImageBuilder imageBuilder = new ImageBuilder(width, height, hasAlpha);
- int colorTable[];
+ int[] colorTable;
if (id.localColorTable != null) {
colorTable = getColorTable(id.localColorTable);
} else if (imageContents.globalColorTable != null) {
@@ -760,7 +760,7 @@ public class GifImageParser extends Imag
}
- private void writeAsSubBlocks(final OutputStream os, final byte bytes[])
+ private void writeAsSubBlocks(final OutputStream os, final byte[] bytes)
throws IOException {
int index = 0;
@@ -904,7 +904,7 @@ public class GifImageParser extends Imag
bos.write(XMP_APPLICATION_ID_AND_AUTH_CODE.length); // 0x0B
bos.write(XMP_APPLICATION_ID_AND_AUTH_CODE);
- final byte xmpXmlBytes[] = xmpXml.getBytes("utf-8");
+ final byte[] xmpXmlBytes = xmpXml.getBytes("utf-8");
bos.write(xmpXmlBytes);
// write "magic trailer"
@@ -980,7 +980,7 @@ public class GifImageParser extends Imag
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);
@@ -1003,7 +1003,7 @@ public class GifImageParser extends Imag
}
}
- final byte compressed[] = compressor.compress(imagedata);
+ final byte[] compressed = compressor.compress(imagedata);
writeAsSubBlocks(bos, compressed);
// image_data_total += compressed.length;
}
@@ -1052,7 +1052,7 @@ public class GifImageParser extends Imag
final GenericGifBlock genericBlock = (GenericGifBlock) block;
- final byte blockBytes[] = genericBlock.appendSubBlocks(true);
+ final byte[] blockBytes = genericBlock.appendSubBlocks(true);
if (blockBytes.length < XMP_APPLICATION_ID_AND_AUTH_CODE.length) {
continue;
}
@@ -1063,7 +1063,7 @@ public class GifImageParser extends Imag
continue;
}
- final byte GIF_MAGIC_TRAILER[] = new byte[256];
+ final byte[] GIF_MAGIC_TRAILER = new byte[256];
for (int magic = 0; magic <= 0xff; magic++) {
GIF_MAGIC_TRAILER[magic] = (byte) (0xff - magic);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java Tue Nov 26 21:08:17 2013
@@ -22,9 +22,9 @@ class ImageContents {
public final GifHeaderInfo gifHeaderInfo;
public final List<GifBlock> blocks;
- public final byte globalColorTable[];
+ public final byte[] globalColorTable;
- public ImageContents(final GifHeaderInfo gifHeaderInfo, final byte globalColorTable[],
+ public ImageContents(final GifHeaderInfo gifHeaderInfo, final byte[] globalColorTable,
final List<GifBlock> blocks) {
this.gifHeaderInfo = gifHeaderInfo;
this.globalColorTable = globalColorTable;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageDescriptor.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageDescriptor.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageDescriptor.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageDescriptor.java Tue Nov 26 21:08:17 2013
@@ -28,28 +28,28 @@ public class ImageDescriptor extends Gif
public final boolean sortFlag;
public final byte sizeOfLocalColorTable;
- public final byte localColorTable[];
- public final byte imageData[];
+ public final byte[] localColorTable;
+ public final byte[] imageData;
- public ImageDescriptor(final int blockCode, final int ImageLeftPosition,
- final int ImageTopPosition, final int ImageWidth, final int ImageHeight,
- final byte PackedFields, final boolean LocalColorTableFlag,
- final boolean InterlaceFlag, final boolean SortFlag,
- final byte SizeofLocalColorTable, final byte LocalColorTable[],
- final byte ImageData[]) {
+ public ImageDescriptor(final int blockCode, final int imageLeftPosition,
+ final int imageTopPosition, final int imageWidth, final int imageHeight,
+ final byte packedFields, final boolean localColorTableFlag,
+ final boolean interlaceFlag, final boolean sortFlag,
+ final byte sizeofLocalColorTable, final byte[] localColorTable,
+ final byte[] imageData) {
super(blockCode);
- this.imageLeftPosition = ImageLeftPosition;
- this.imageTopPosition = ImageTopPosition;
- this.imageWidth = ImageWidth;
- this.imageHeight = ImageHeight;
- this.packedFields = PackedFields;
- this.localColorTableFlag = LocalColorTableFlag;
- this.interlaceFlag = InterlaceFlag;
- this.sortFlag = SortFlag;
- this.sizeOfLocalColorTable = SizeofLocalColorTable;
+ this.imageLeftPosition = imageLeftPosition;
+ this.imageTopPosition = imageTopPosition;
+ this.imageWidth = imageWidth;
+ this.imageHeight = imageHeight;
+ this.packedFields = packedFields;
+ this.localColorTableFlag = localColorTableFlag;
+ this.interlaceFlag = interlaceFlag;
+ this.sortFlag = sortFlag;
+ this.sizeOfLocalColorTable = sizeofLocalColorTable;
- this.localColorTable = LocalColorTable;
- this.imageData = ImageData;
+ this.localColorTable = localColorTable;
+ this.imageData = imageData;
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java Tue Nov 26 21:08:17 2013
@@ -43,7 +43,7 @@ import org.apache.commons.imaging.util.I
public class IcnsImageParser extends ImageParser {
public static final int ICNS_MAGIC = IcnsType.typeAsInt("icns");
private static final String DEFAULT_EXTENSION = ".icns";
- private static final String ACCEPTED_EXTENSIONS[] = { ".icns", };
+ private static final String[] ACCEPTED_EXTENSIONS = { ".icns", };
public IcnsImageParser() {
super.setByteOrder(ByteOrder.BIG_ENDIAN);
@@ -70,7 +70,7 @@ public class IcnsImageParser extends Ima
}
@Override
- public boolean embedICCProfile(final File src, final File dst, final byte profile[]) {
+ public boolean embedICCProfile(final File src, final File dst, final byte[] profile) {
return false;
}
@@ -220,10 +220,9 @@ public class IcnsImageParser extends Ima
private static class IcnsContents {
public final IcnsHeader icnsHeader;
- public final IcnsElement icnsElements[];
+ public final IcnsElement[] icnsElements;
- public IcnsContents(final IcnsHeader icnsHeader,
- final IcnsElement[] icnsElements) {
+ public IcnsContents(final IcnsHeader icnsHeader, final IcnsElement[] icnsElements) {
super();
this.icnsHeader = icnsHeader;
this.icnsElements = icnsElements;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java Tue Nov 26 21:08:17 2013
@@ -49,7 +49,7 @@ import org.apache.commons.imaging.util.I
public class IcoImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".ico";
- private static final String ACCEPTED_EXTENSIONS[] = { ".ico", ".cur", };
+ private static final String[] ACCEPTED_EXTENSIONS = { ".ico", ".cur", };
public IcoImageParser() {
super.setByteOrder(ByteOrder.LITTLE_ENDIAN);
@@ -77,7 +77,7 @@ public class IcoImageParser extends Imag
}
@Override
- public boolean embedICCProfile(final File src, final File dst, final byte profile[]) {
+ public boolean embedICCProfile(final File src, final File dst, final byte[] profile) {
return false;
}
@@ -543,7 +543,7 @@ public class IcoImageParser extends Imag
private static class ImageContents {
public final FileHeader fileHeader;
- public final IconData iconDatas[];
+ public final IconData[] iconDatas;
public ImageContents(final FileHeader fileHeader,
final IconData[] iconDatas) {
@@ -561,12 +561,12 @@ public class IcoImageParser extends Imag
is = byteSource.getInputStream();
final FileHeader fileHeader = readFileHeader(is);
- final IconInfo fIconInfos[] = new IconInfo[fileHeader.iconCount];
+ final IconInfo[] fIconInfos = new IconInfo[fileHeader.iconCount];
for (int i = 0; i < fileHeader.iconCount; i++) {
fIconInfos[i] = readIconInfo(is);
}
- final IconData fIconDatas[] = new IconData[fileHeader.iconCount];
+ final IconData[] fIconDatas = new IconData[fileHeader.iconCount];
for (int i = 0; i < fileHeader.iconCount; i++) {
final byte[] iconData = byteSource.getBlock(
fIconInfos[i].ImageOffset, fIconInfos[i].ImageSize);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java Tue Nov 26 21:08:17 2013
@@ -60,7 +60,7 @@ import org.apache.commons.imaging.util.D
public class JpegImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".jpg";
- private static final String ACCEPTED_EXTENSIONS[] = { ".jpg", ".jpeg", };
+ private static final String[] ACCEPTED_EXTENSIONS = { ".jpg", ".jpeg", };
public JpegImageParser() {
setByteOrder(ByteOrder.BIG_ENDIAN);
@@ -96,7 +96,7 @@ public class JpegImageParser extends Ima
return jpegDecoder.decode(byteSource);
}
- private boolean keepMarker(final int marker, final int markers[]) {
+ private boolean keepMarker(final int marker, final int[] markers) {
if (markers == null) {
return true;
}
@@ -111,7 +111,7 @@ public class JpegImageParser extends Ima
}
public List<Segment> readSegments(final ByteSource byteSource,
- final int markers[], final boolean returnAfterFirst,
+ final int[] markers, final boolean returnAfterFirst,
final boolean readEverything) throws ImageReadException, IOException {
final List<Segment> result = new ArrayList<Segment>();
final JpegImageParser parser = this;
@@ -138,15 +138,15 @@ public class JpegImageParser extends Ima
return false;
}
- public void visitSOS(final int marker, final byte markerBytes[],
- final byte imageData[]) {
+ public void visitSOS(final int marker, final byte[] markerBytes,
+ final byte[] imageData) {
// don't need image data
}
// return false to exit traversal.
- public boolean visitSegment(final int marker, final byte markerBytes[],
- final int markerLength, final byte markerLengthBytes[],
- final byte segmentData[]) throws ImageReadException, IOException {
+ public boolean visitSegment(final int marker, final byte[] markerBytes,
+ final int markerLength, final byte[] markerLengthBytes,
+ final byte[] segmentData) throws ImageReadException, IOException {
if (marker == JpegConstants.EOIMarker) {
return false;
}
@@ -243,7 +243,7 @@ public class JpegImageParser extends Ima
total += segment.icc_bytes.length;
}
- final byte result[] = new byte[total];
+ final byte[] result = new byte[total];
int progress = 0;
for (App2Segment segment : segments) {
@@ -266,7 +266,7 @@ public class JpegImageParser extends Ima
Debug.debug();
}
- public List<Segment> readSegments(final ByteSource byteSource, final int markers[],
+ public List<Segment> readSegments(final ByteSource byteSource, final int[] markers,
final boolean returnAfterFirst) throws ImageReadException, IOException {
return readSegments(byteSource, markers, returnAfterFirst, false);
}
@@ -292,7 +292,7 @@ public class JpegImageParser extends Ima
return null;
}
- final byte bytes[] = assembleSegments(filtered);
+ final byte[] bytes = assembleSegments(filtered);
if (getDebug()) {
System.out.println("bytes" + ": " + bytes.length);
@@ -339,7 +339,7 @@ public class JpegImageParser extends Ima
public TiffImageMetadata getExifMetadata(final ByteSource byteSource, Map<String,Object> params)
throws ImageReadException, IOException {
- final byte bytes[] = getExifRawData(byteSource);
+ final byte[] bytes = getExifRawData(byteSource);
if (null == bytes) {
return null;
}
@@ -384,7 +384,7 @@ public class JpegImageParser extends Ima
}
final GenericSegment segment = (GenericSegment) exifSegments.get(0);
- final byte bytes[] = segment.getSegmentData();
+ final byte[] bytes = segment.getSegmentData();
// byte head[] = readBytearray("exif head", bytes, 0, 6);
//
@@ -395,7 +395,7 @@ public class JpegImageParser extends Ima
public boolean hasExifSegment(final ByteSource byteSource)
throws ImageReadException, IOException {
- final boolean result[] = { false, };
+ final boolean[] result = { false, };
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
@@ -403,15 +403,15 @@ public class JpegImageParser extends Ima
return false;
}
- public void visitSOS(final int marker, final byte markerBytes[],
- final byte imageData[]) {
+ public void visitSOS(final int marker, final byte[] markerBytes,
+ final byte[] imageData) {
// don't need image data
}
// return false to exit traversal.
- public boolean visitSegment(final int marker, final byte markerBytes[],
- final int markerLength, final byte markerLengthBytes[],
- final byte segmentData[]) throws ImageReadException, IOException {
+ public boolean visitSegment(final int marker, final byte[] markerBytes,
+ final int markerLength, final byte[] markerLengthBytes,
+ final byte[] segmentData) throws ImageReadException, IOException {
if (marker == 0xffd9) {
return false;
}
@@ -434,7 +434,7 @@ public class JpegImageParser extends Ima
public boolean hasIptcSegment(final ByteSource byteSource)
throws ImageReadException, IOException {
- final boolean result[] = { false, };
+ final boolean[] result = { false, };
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
@@ -442,15 +442,15 @@ public class JpegImageParser extends Ima
return false;
}
- public void visitSOS(final int marker, final byte markerBytes[],
- final byte imageData[]) {
+ public void visitSOS(final int marker, final byte[] markerBytes,
+ final byte[] imageData) {
// don't need image data
}
// return false to exit traversal.
- public boolean visitSegment(final int marker, final byte markerBytes[],
- final int markerLength, final byte markerLengthBytes[],
- final byte segmentData[]) throws ImageReadException, IOException {
+ public boolean visitSegment(final int marker, final byte[] markerBytes,
+ final int markerLength, final byte[] markerLengthBytes,
+ final byte[] segmentData) throws ImageReadException, IOException {
if (marker == 0xffd9) {
return false;
}
@@ -473,7 +473,7 @@ public class JpegImageParser extends Ima
public boolean hasXmpSegment(final ByteSource byteSource)
throws ImageReadException, IOException {
- final boolean result[] = { false, };
+ final boolean[] result = { false, };
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
@@ -481,15 +481,15 @@ public class JpegImageParser extends Ima
return false;
}
- public void visitSOS(final int marker, final byte markerBytes[],
- final byte imageData[]) {
+ public void visitSOS(final int marker, final byte[] markerBytes,
+ final byte[] imageData) {
// don't need image data
}
// return false to exit traversal.
- public boolean visitSegment(final int marker, final byte markerBytes[],
- final int markerLength, final byte markerLengthBytes[],
- final byte segmentData[]) throws ImageReadException, IOException {
+ public boolean visitSegment(final int marker, final byte[] markerBytes,
+ final int markerLength, final byte[] markerLengthBytes,
+ final byte[] segmentData) throws ImageReadException, IOException {
if (marker == 0xffd9) {
return false;
}
@@ -531,15 +531,15 @@ public class JpegImageParser extends Ima
return false;
}
- public void visitSOS(final int marker, final byte markerBytes[],
- final byte imageData[]) {
+ public void visitSOS(final int marker, final byte[] markerBytes,
+ final byte[] imageData) {
// don't need image data
}
// return false to exit traversal.
- public boolean visitSegment(final int marker, final byte markerBytes[],
- final int markerLength, final byte markerLengthBytes[],
- final byte segmentData[]) throws ImageReadException, IOException {
+ public boolean visitSegment(final int marker, final byte[] markerBytes,
+ final int markerLength, final byte[] markerLengthBytes,
+ final byte[] segmentData) throws ImageReadException, IOException {
if (marker == 0xffd9) {
return false;
}
@@ -630,12 +630,12 @@ public class JpegImageParser extends Ima
return new Dimension(fSOFNSegment.width, fSOFNSegment.height);
}
- public byte[] embedICCProfile(final byte image[], final byte profile[]) {
+ public byte[] embedICCProfile(final byte[] image, final byte[] profile) {
return null;
}
@Override
- public boolean embedICCProfile(final File src, final File dst, final byte profile[]) {
+ public boolean embedICCProfile(final File src, final File dst, final byte[] profile) {
return false;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java Tue Nov 26 21:08:17 2013
@@ -35,12 +35,12 @@ public class JpegUtils extends BinaryFil
// return false to exit before reading image data.
boolean beginSOS();
- void visitSOS(int marker, byte markerBytes[], byte imageData[]);
+ void visitSOS(int marker, byte[] markerBytes, byte[] imageData);
// return false to exit traversal.
- boolean visitSegment(int marker, byte markerBytes[],
- int segmentLength, byte segmentLengthBytes[],
- byte segmentData[]) throws ImageReadException,
+ boolean visitSegment(int marker, byte[] markerBytes,
+ int segmentLength, byte[] segmentLengthBytes,
+ byte[] segmentData) throws ImageReadException,
IOException;
}
@@ -73,21 +73,19 @@ public class JpegUtils extends BinaryFil
return;
}
- final byte imageData[] = getStreamBytes(is);
+ final byte[] imageData = getStreamBytes(is);
visitor.visitSOS(marker, markerBytes, imageData);
break;
}
- final byte segmentLengthBytes[] = readBytes("segmentLengthBytes",
- is, 2, "segmentLengthBytes");
+ final byte[] segmentLengthBytes = readBytes("segmentLengthBytes", is, 2, "segmentLengthBytes");
final int segmentLength = toUInt16(segmentLengthBytes);
- final byte segmentData[] = readBytes("Segment Data",
+ final byte[] segmentData = readBytes("Segment Data",
is, segmentLength - 2,
"Invalid Segment: insufficient data");
- if (!visitor.visitSegment(marker, markerBytes, segmentLength,
- segmentLengthBytes, segmentData)) {
+ if (!visitor.visitSegment(marker, markerBytes, segmentLength, segmentLengthBytes, segmentData)) {
canThrow = true;
return;
}
@@ -167,17 +165,15 @@ public class JpegUtils extends BinaryFil
return true;
}
- public void visitSOS(final int marker, final byte markerBytes[],
- final byte imageData[]) {
- Debug.debug("SOS marker. " + imageData.length
- + " bytes of image data.");
+ public void visitSOS(final int marker, final byte[] markerBytes, final byte[] imageData) {
+ Debug.debug("SOS marker. " + imageData.length + " bytes of image data.");
Debug.debug("");
}
// return false to exit traversal.
- public boolean visitSegment(final int marker, final byte markerBytes[],
- final int segmentLength, final byte segmentLengthBytes[],
- final byte segmentData[]) {
+ public boolean visitSegment(final int marker, final byte[] markerBytes,
+ final int segmentLength, final byte[] segmentLengthBytes,
+ final byte[] segmentData) {
Debug.debug("Segment marker: " + Integer.toHexString(marker)
+ " (" + getMarkerName(marker) + "), "
+ segmentData.length + " bytes of segment data.");
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java Tue Nov 26 21:08:17 2013
@@ -63,7 +63,7 @@ public class JpegDecoder extends BinaryF
return true;
}
- public void visitSOS(final int marker, final byte markerBytes[], final byte imageData[]) {
+ public void visitSOS(final int marker, final byte[] markerBytes, final byte[] imageData) {
final ByteArrayInputStream is = new ByteArrayInputStream(imageData);
try {
final int segmentLength = read2Bytes("segmentLength", is,
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/ZigZag.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/ZigZag.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/ZigZag.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/ZigZag.java Tue Nov 26 21:08:17 2013
@@ -16,7 +16,7 @@
package org.apache.commons.imaging.formats.jpeg.decoder;
final class ZigZag {
- private static final int zigZag[] = {
+ private static final int[] ZIG_ZAG = {
0, 1, 5, 6, 14, 15, 27, 28,
2, 4, 7, 13, 16, 26, 29, 42,
3, 8, 12, 17, 25, 30, 41, 43,
@@ -32,13 +32,13 @@ final class ZigZag {
public static void zigZagToBlock(final int[] zz, final int[] block) {
for (int i = 0; i < 64; i++) {
- block[i] = zz[zigZag[i]];
+ block[i] = zz[ZIG_ZAG[i]];
}
}
public static void blockToZigZag(final int[] block, final int[] zz) {
for (int i = 0; i < 64; i++) {
- zz[zigZag[i]] = block[i];
+ zz[ZIG_ZAG[i]] = block[i];
}
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java Tue Nov 26 21:08:17 2013
@@ -87,9 +87,9 @@ public class ExifRewriter extends Binary
private static class JFIFPieceSegment extends JFIFPiece {
public final int marker;
- public final byte markerBytes[];
- public final byte markerLengthBytes[];
- public final byte segmentData[];
+ public final byte[] markerBytes;
+ public final byte[] markerLengthBytes;
+ public final byte[] segmentData;
public JFIFPieceSegment(final int marker, final byte[] markerBytes,
final byte[] markerLengthBytes, final byte[] segmentData) {
@@ -116,11 +116,10 @@ public class ExifRewriter extends Binary
}
private static class JFIFPieceImageData extends JFIFPiece {
- public final byte markerBytes[];
- public final byte imageData[];
+ public final byte[] markerBytes;
+ public final byte[] imageData;
- public JFIFPieceImageData(final byte[] markerBytes,
- final byte[] imageData) {
+ public JFIFPieceImageData(final byte[] markerBytes, final byte[] imageData) {
super();
this.markerBytes = markerBytes;
this.imageData = imageData;
@@ -146,15 +145,14 @@ public class ExifRewriter extends Binary
return true;
}
- public void visitSOS(final int marker, final byte markerBytes[],
- final byte imageData[]) {
+ public void visitSOS(final int marker, final byte[] markerBytes, final byte[] imageData) {
pieces.add(new JFIFPieceImageData(markerBytes, imageData));
}
// return false to exit traversal.
- public boolean visitSegment(final int marker, final byte markerBytes[],
- final int markerLength, final byte markerLengthBytes[],
- final byte segmentData[]) throws
+ public boolean visitSegment(final int marker, final byte[] markerBytes,
+ final int markerLength, final byte[] markerLengthBytes,
+ final byte[] segmentData) throws
// ImageWriteException,
ImageReadException, IOException {
if (marker != JpegConstants.JPEG_APP1_Marker) {
@@ -221,7 +219,7 @@ public class ExifRewriter extends Binary
* @param os
* OutputStream to write the image to.
*/
- public void removeExifMetadata(final byte src[], final OutputStream os)
+ public void removeExifMetadata(final byte[] src, final OutputStream os)
throws ImageReadException, IOException, ImageWriteException {
final ByteSource byteSource = new ByteSourceArray(src);
removeExifMetadata(byteSource, os);
@@ -312,7 +310,7 @@ public class ExifRewriter extends Binary
* @param outputSet
* TiffOutputSet containing the EXIF data to write.
*/
- public void updateExifMetadataLossless(final byte src[], final OutputStream os,
+ public void updateExifMetadataLossless(final byte[] src, final OutputStream os,
final TiffOutputSet outputSet) throws ImageReadException, IOException,
ImageWriteException {
final ByteSource byteSource = new ByteSourceArray(src);
@@ -378,7 +376,7 @@ public class ExifRewriter extends Binary
JFIFPieceSegment exifPiece = null;
exifPiece = (JFIFPieceSegment) jfifPieces.exifPieces.get(0);
- byte exifBytes[] = exifPiece.segmentData;
+ byte[] exifBytes = exifPiece.segmentData;
exifBytes = remainingBytes("trimmed exif bytes", exifBytes, 6);
writer = new TiffImageWriterLossless(outputSet.byteOrder, exifBytes);
@@ -388,7 +386,7 @@ public class ExifRewriter extends Binary
}
final boolean includeEXIFPrefix = true;
- final byte newBytes[] = writeExifSegment(writer, outputSet, includeEXIFPrefix);
+ final byte[] newBytes = writeExifSegment(writer, outputSet, includeEXIFPrefix);
writeSegmentsReplacingExif(os, pieces, newBytes);
}
@@ -409,7 +407,7 @@ public class ExifRewriter extends Binary
* @param outputSet
* TiffOutputSet containing the EXIF data to write.
*/
- public void updateExifMetadataLossy(final byte src[], final OutputStream os,
+ public void updateExifMetadataLossy(final byte[] src, final OutputStream os,
final TiffOutputSet outputSet) throws ImageReadException, IOException,
ImageWriteException {
final ByteSource byteSource = new ByteSourceArray(src);
@@ -488,13 +486,13 @@ public class ExifRewriter extends Binary
outputSet.byteOrder);
final boolean includeEXIFPrefix = true;
- final byte newBytes[] = writeExifSegment(writer, outputSet, includeEXIFPrefix);
+ final byte[] newBytes = writeExifSegment(writer, outputSet, includeEXIFPrefix);
writeSegmentsReplacingExif(os, pieces, newBytes);
}
private void writeSegmentsReplacingExif(final OutputStream os,
- final List<JFIFPiece> segments, final byte newBytes[])
+ final List<JFIFPiece> segments, final byte[] newBytes)
throws ImageWriteException, IOException {
boolean canThrow = false;
@@ -510,13 +508,13 @@ public class ExifRewriter extends Binary
}
if (!hasExif && newBytes != null) {
- final byte markerBytes[] = toBytes((short)JpegConstants.JPEG_APP1_Marker);
+ final byte[] markerBytes = toBytes((short)JpegConstants.JPEG_APP1_Marker);
if (newBytes.length > 0xffff) {
throw new ExifOverflowException(
"APP1 Segment is too long: " + newBytes.length);
}
final int markerLength = newBytes.length + 2;
- final byte markerLengthBytes[] = toBytes((short)markerLength);
+ final byte[] markerLengthBytes = toBytes((short)markerLength);
int index = 0;
final JFIFPieceSegment firstSegment = (JFIFPieceSegment) segments
@@ -542,13 +540,13 @@ public class ExifRewriter extends Binary
continue;
}
- final byte markerBytes[] = toBytes((short) JpegConstants.JPEG_APP1_Marker);
+ final byte[] markerBytes = toBytes((short) JpegConstants.JPEG_APP1_Marker);
if (newBytes.length > 0xffff) {
throw new ExifOverflowException(
"APP1 Segment is too long: " + newBytes.length);
}
final int markerLength = newBytes.length + 2;
- final byte markerLengthBytes[] = toBytes((short) markerLength);
+ final byte[] markerLengthBytes = toBytes((short) markerLength);
os.write(markerBytes);
os.write(markerLengthBytes);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java Tue Nov 26 21:08:17 2013
@@ -45,7 +45,7 @@ public class IptcParser extends BinaryFi
setByteOrder(ByteOrder.BIG_ENDIAN);
}
- public boolean isPhotoshopJpegSegment(final byte segmentData[]) {
+ public boolean isPhotoshopJpegSegment(final byte[] segmentData) {
if (!BinaryFileParser.startsWith(segmentData,
JpegConstants.PHOTOSHOP_IDENTIFICATION_STRING)) {
return false;
@@ -93,7 +93,7 @@ public class IptcParser extends BinaryFi
* Some IPTC blocks are missing this first "record version" record, so we
* don't require it.
*/
- public PhotoshopApp13Data parsePhotoshopSegment(final byte bytes[], final Map<String,Object> params)
+ public PhotoshopApp13Data parsePhotoshopSegment(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
final boolean strict = params != null && Boolean.TRUE.equals(params.get(ImagingConstants.PARAM_KEY_STRICT));
final boolean verbose = params != null && Boolean.TRUE.equals(params.get(ImagingConstants.PARAM_KEY_VERBOSE));
@@ -101,7 +101,7 @@ public class IptcParser extends BinaryFi
return parsePhotoshopSegment(bytes, verbose, strict);
}
- public PhotoshopApp13Data parsePhotoshopSegment(final byte bytes[],
+ public PhotoshopApp13Data parsePhotoshopSegment(final byte[] bytes,
final boolean verbose, final boolean strict) throws ImageReadException,
IOException {
final List<IptcRecord> records = new ArrayList<IptcRecord>();
@@ -120,7 +120,7 @@ public class IptcParser extends BinaryFi
return new PhotoshopApp13Data(records, blocks);
}
- protected List<IptcRecord> parseIPTCBlock(final byte bytes[], final boolean verbose)
+ protected List<IptcRecord> parseIPTCBlock(final byte[] bytes, final boolean verbose)
throws IOException {
final List<IptcRecord> elements = new ArrayList<IptcRecord>();
@@ -182,7 +182,7 @@ public class IptcParser extends BinaryFi
return elements;
}
- final byte recordData[] = slice(bytes, index, recordSize);
+ final byte[] recordData = slice(bytes, index, recordSize);
index += recordSize;
// Debug.debug("recordSize", recordSize + " (0x"
@@ -246,7 +246,7 @@ public class IptcParser extends BinaryFi
return elements;
}
- protected List<IptcBlock> parseAllBlocks(final byte bytes[], final boolean verbose,
+ protected List<IptcBlock> parseAllBlocks(final byte[] bytes, final boolean verbose,
final boolean strict) throws ImageReadException, IOException {
final List<IptcBlock> blocks = new ArrayList<IptcBlock>();
@@ -393,7 +393,7 @@ public class IptcParser extends BinaryFi
public byte[] writeIPTCBlock(List<IptcRecord> elements)
throws ImageWriteException, IOException {
- byte blockData[];
+ byte[] blockData;
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
BinaryOutputStream bos = null;
boolean canThrow = false;
@@ -436,7 +436,7 @@ public class IptcParser extends BinaryFi
}
bos.write(element.iptcType.getType());
- final byte recordData[] = element.value.getBytes("ISO-8859-1");
+ final byte[] recordData = element.value.getBytes("ISO-8859-1");
if (!new String(recordData, "ISO-8859-1").equals(element.value)) {
throw new ImageWriteException(
"Invalid record value, not ISO-8859-1");
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java Tue Nov 26 21:08:17 2013
@@ -71,7 +71,7 @@ public class JpegIptcRewriter extends Jp
* @param os
* OutputStream to write the image to.
*/
- public void removeIPTC(final byte src[], final OutputStream os)
+ public void removeIPTC(final byte[] src, final OutputStream os)
throws ImageReadException, IOException, ImageWriteException {
final ByteSource byteSource = new ByteSourceArray(src);
removeIPTC(byteSource, os);
@@ -126,7 +126,7 @@ public class JpegIptcRewriter extends Jp
final List<IptcRecord> newRecords = new ArrayList<IptcRecord>();
final PhotoshopApp13Data newData = new PhotoshopApp13Data(newRecords,
newBlocks);
- final byte segmentBytes[] = new IptcParser()
+ final byte[] segmentBytes = new IptcParser()
.writePhotoshopApp13Segment(newData);
final JFIFPieceSegment newSegment = new JFIFPieceSegment(
oldSegment.marker, segmentBytes);
@@ -147,7 +147,7 @@ public class JpegIptcRewriter extends Jp
* @param newData
* structure containing IPTC data.
*/
- public void writeIPTC(final byte src[], final OutputStream os,
+ public void writeIPTC(final byte[] src, final OutputStream os,
final PhotoshopApp13Data newData) throws ImageReadException, IOException,
ImageWriteException {
final ByteSource byteSource = new ByteSourceArray(src);
@@ -219,21 +219,17 @@ public class JpegIptcRewriter extends Jp
{
// discard old iptc blocks.
final List<IptcBlock> newBlocks = newData.getNonIptcBlocks();
- final byte[] newBlockBytes = new IptcParser().writeIPTCBlock(newData
- .getRecords());
+ final byte[] newBlockBytes = new IptcParser().writeIPTCBlock(newData.getRecords());
final int blockType = IptcConstants.IMAGE_RESOURCE_BLOCK_IPTC_DATA;
final byte[] blockNameBytes = new byte[0];
- final IptcBlock newBlock = new IptcBlock(blockType, blockNameBytes,
- newBlockBytes);
+ final IptcBlock newBlock = new IptcBlock(blockType, blockNameBytes,newBlockBytes);
newBlocks.add(newBlock);
newData = new PhotoshopApp13Data(newData.getRecords(), newBlocks);
- final byte segmentBytes[] = new IptcParser()
- .writePhotoshopApp13Segment(newData);
- final JFIFPieceSegment newSegment = new JFIFPieceSegment(
- JpegConstants.JPEG_APP13_Marker, segmentBytes);
+ byte[] segmentBytes = new IptcParser().writePhotoshopApp13Segment(newData);
+ JFIFPieceSegment newSegment = new JFIFPieceSegment(JpegConstants.JPEG_APP13_Marker, segmentBytes);
newPieces = insertAfterLastAppSegments(newPieces, Arrays.asList(newSegment));
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java Tue Nov 26 21:08:17 2013
@@ -32,15 +32,15 @@ public class App13Segment extends AppnSe
// public final List elements = new ArrayList();
// public final boolean isIPTCJpegSegment;
- public App13Segment(final JpegImageParser parser, final int marker, final byte segmentData[])
+ public App13Segment(final JpegImageParser parser, final int marker, final byte[] segmentData)
throws IOException {
this(parser, marker, segmentData.length, new ByteArrayInputStream(
segmentData));
}
- public App13Segment(final JpegImageParser parser, final int marker, final int marker_length,
+ public App13Segment(final JpegImageParser parser, final int marker, final int markerLength,
final InputStream is) throws IOException {
- super(marker, marker_length, is);
+ super(marker, markerLength, is);
this.parser = parser;
// isIPTCJpegSegment = new IptcParser().isIPTCJpegSegment(bytes);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App14Segment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App14Segment.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App14Segment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App14Segment.java Tue Nov 26 21:08:17 2013
@@ -41,7 +41,7 @@ public class App14Segment extends AppnSe
ADOBE_PREFIX = adobe;
}
- public App14Segment(final int marker, final byte segmentData[])
+ public App14Segment(final int marker, final byte[] segmentData)
throws IOException {
this(marker, segmentData.length, new ByteArrayInputStream(
segmentData));
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java Tue Nov 26 21:08:17 2013
@@ -25,10 +25,10 @@ import org.apache.commons.imaging.common
import org.apache.commons.imaging.formats.jpeg.JpegConstants;
public class App2Segment extends AppnSegment implements Comparable<App2Segment> {
- public final byte icc_bytes[];
+ public final byte[] icc_bytes;
public final int cur_marker, num_markers;
- public App2Segment(final int marker, final byte segmentData[])
+ public App2Segment(final int marker, final byte[] segmentData)
throws ImageReadException, IOException {
this(marker, segmentData.length, new ByteArrayInputStream(segmentData));
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java Tue Nov 26 21:08:17 2013
@@ -21,7 +21,7 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
public class ComSegment extends GenericSegment {
- public ComSegment(final int marker, final byte segmentData[]) {
+ public ComSegment(final int marker, final byte[] segmentData) {
super(marker, segmentData);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/GenericSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/GenericSegment.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/GenericSegment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/GenericSegment.java Tue Nov 26 21:08:17 2013
@@ -21,7 +21,7 @@ import java.io.InputStream;
import java.io.PrintWriter;
public abstract class GenericSegment extends Segment {
- protected final byte segmentData[];
+ protected final byte[] segmentData;
public GenericSegment(final int marker, final int marker_length, final InputStream is)
throws IOException {
@@ -31,7 +31,7 @@ public abstract class GenericSegment ext
"Invalid Segment: insufficient data");
}
- public GenericSegment(final int marker, final byte bytes[]) {
+ public GenericSegment(final int marker, final byte[] bytes) {
super(marker, bytes.length);
this.segmentData = bytes;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegment.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegment.java Tue Nov 26 21:08:17 2013
@@ -39,7 +39,7 @@ public class JfifSegment extends Segment
return "JFIF (" + getSegmentType() + ")";
}
- public JfifSegment(final int marker, final byte segmentData[])
+ public JfifSegment(final int marker, final byte[] segmentData)
throws ImageReadException, IOException {
this(marker, segmentData.length, new ByteArrayInputStream(segmentData));
}
@@ -48,7 +48,7 @@ public class JfifSegment extends Segment
throws ImageReadException, IOException {
super(marker, marker_length);
- final byte signature[] = readBytes(is, JpegConstants.JFIF0_SIGNATURE.size());
+ final byte[] signature = readBytes(is, JpegConstants.JFIF0_SIGNATURE.size());
if (!JpegConstants.JFIF0_SIGNATURE.equals(signature)
&& !JpegConstants.JFIF0_SIGNATURE_ALTERNATIVE.equals(signature)) {
throw new ImageReadException(
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SofnSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SofnSegment.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SofnSegment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SofnSegment.java Tue Nov 26 21:08:17 2013
@@ -43,7 +43,7 @@ public class SofnSegment extends Segment
}
}
- public SofnSegment(final int marker, final byte segmentData[])
+ public SofnSegment(final int marker, final byte[] segmentData)
throws IOException {
this(marker, segmentData.length, new ByteArrayInputStream(segmentData));
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/UnknownSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/UnknownSegment.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/UnknownSegment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/UnknownSegment.java Tue Nov 26 21:08:17 2013
@@ -25,7 +25,7 @@ public class UnknownSegment extends Gene
super(marker, marker_length, is);
}
- public UnknownSegment(final int marker, final byte bytes[]) {
+ public UnknownSegment(final int marker, final byte[] bytes) {
super(marker, bytes);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java Tue Nov 26 21:08:17 2013
@@ -84,9 +84,9 @@ public class JpegRewriter extends Binary
protected static class JFIFPieceSegment extends JFIFPiece {
public final int marker;
- public final byte markerBytes[];
- public final byte segmentLengthBytes[];
- public final byte segmentData[];
+ public final byte[] markerBytes;
+ public final byte[] segmentLengthBytes;
+ public final byte[] segmentData;
public JFIFPieceSegment(final int marker, final byte[] segmentData) {
this(marker,
@@ -157,11 +157,10 @@ public class JpegRewriter extends Binary
}
protected static class JFIFPieceImageData extends JFIFPiece {
- public final byte markerBytes[];
- public final byte imageData[];
+ public final byte[] markerBytes;
+ public final byte[] imageData;
- public JFIFPieceImageData(final byte[] markerBytes,
- final byte[] imageData) {
+ public JFIFPieceImageData(final byte[] markerBytes, final byte[] imageData) {
super();
this.markerBytes = markerBytes;
this.imageData = imageData;
@@ -187,15 +186,14 @@ public class JpegRewriter extends Binary
return true;
}
- public void visitSOS(final int marker, final byte markerBytes[],
- final byte imageData[]) {
+ public void visitSOS(final int marker, final byte[] markerBytes, final byte[] imageData) {
pieces.add(new JFIFPieceImageData(markerBytes, imageData));
}
// return false to exit traversal.
- public boolean visitSegment(final int marker, final byte markerBytes[],
- final int segmentLength, final byte segmentLengthBytes[],
- final byte segmentData[]) throws ImageReadException, IOException {
+ public boolean visitSegment(final int marker, final byte[] markerBytes,
+ final int segmentLength, final byte[] segmentLengthBytes,
+ final byte[] segmentData) throws ImageReadException, IOException {
final JFIFPiece piece = new JFIFPieceSegment(marker, markerBytes,
segmentLengthBytes, segmentData);
pieces.add(piece);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParser.java Tue Nov 26 21:08:17 2013
@@ -30,11 +30,11 @@ public class JpegXmpParser extends Binar
setByteOrder(ByteOrder.BIG_ENDIAN);
}
- public boolean isXmpJpegSegment(final byte segmentData[]) {
+ public boolean isXmpJpegSegment(final byte[] segmentData) {
return BinaryFileParser.startsWith(segmentData, JpegConstants.XMP_IDENTIFIER);
}
- public String parseXmpJpegSegment(final byte segmentData[])
+ public String parseXmpJpegSegment(final byte[] segmentData)
throws ImageReadException {
if (!isXmpJpegSegment(segmentData)) {
throw new ImageReadException("Invalid JPEG XMP Segment.");
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java Tue Nov 26 21:08:17 2013
@@ -66,7 +66,7 @@ public class JpegXmpRewriter extends Jpe
* @param os
* OutputStream to write the image to.
*/
- public void removeXmpXml(final byte src[], final OutputStream os)
+ public void removeXmpXml(final byte[] src, final OutputStream os)
throws ImageReadException, IOException {
final ByteSource byteSource = new ByteSourceArray(src);
removeXmpXml(byteSource, os);
@@ -117,7 +117,7 @@ public class JpegXmpRewriter extends Jpe
* @param xmpXml
* String containing XMP XML.
*/
- public void updateXmpXml(final byte src[], final OutputStream os, final String xmpXml)
+ public void updateXmpXml(final byte[] src, final OutputStream os, final String xmpXml)
throws ImageReadException, IOException, ImageWriteException {
final ByteSource byteSource = new ByteSourceArray(src);
updateXmpXml(byteSource, os, xmpXml);
@@ -176,11 +176,11 @@ public class JpegXmpRewriter extends Jpe
pieces = removeXmpSegments(pieces);
final List<JFIFPieceSegment> newPieces = new ArrayList<JFIFPieceSegment>();
- final byte xmpXmlBytes[] = xmpXml.getBytes("utf-8");
+ final byte[] xmpXmlBytes = xmpXml.getBytes("utf-8");
int index = 0;
while (index < xmpXmlBytes.length) {
final int segmentSize = Math.min(xmpXmlBytes.length, JpegConstants.MAX_SEGMENT_SIZE);
- final byte segmentData[] = writeXmpSegment(xmpXmlBytes, index,
+ final byte[] segmentData = writeXmpSegment(xmpXmlBytes, index,
segmentSize);
newPieces.add(new JFIFPieceSegment(JpegConstants.JPEG_APP1_Marker, segmentData));
index += segmentSize;
@@ -191,7 +191,7 @@ public class JpegXmpRewriter extends Jpe
writeSegments(os, pieces);
}
- private byte[] writeXmpSegment(final byte xmpXmlData[], final int start, final int length)
+ private byte[] writeXmpSegment(final byte[] xmpXmlData, final int start, final int length)
throws IOException {
final ByteArrayOutputStream os = new ByteArrayOutputStream();
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java Tue Nov 26 21:08:17 2013
@@ -63,7 +63,7 @@ public class PcxImageParser extends Imag
// images properly.
private static final String DEFAULT_EXTENSION = ".pcx";
- private static final String ACCEPTED_EXTENSIONS[] = { ".pcx", ".pcc", };
+ private static final String[] ACCEPTED_EXTENSIONS = { ".pcx", ".pcc", };
public PcxImageParser() {
super.setByteOrder(ByteOrder.LITTLE_ENDIAN);
@@ -91,7 +91,7 @@ public class PcxImageParser extends Imag
}
@Override
- public boolean embedICCProfile(final File src, final File dst, final byte profile[]) {
+ public boolean embedICCProfile(final File src, final File dst, final byte[] profile) {
return false;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java Tue Nov 26 21:08:17 2013
@@ -199,8 +199,8 @@ public class PcxWriter {
bos.write2Bytes(0); // vScreenSize
bos.write(new byte[54]);
- final int rgbs[] = new int[src.getWidth()];
- final byte rgbBytes[] = new byte[4 * bytesPerLine];
+ final int[] rgbs = new int[src.getWidth()];
+ final byte[] rgbBytes = new byte[4 * bytesPerLine];
for (int y = 0; y < src.getHeight(); y++) {
src.getRGB(0, y, src.getWidth(), 1, rgbs, 0, src.getWidth());
for (int x = 0; x < rgbs.length; x++) {
@@ -239,8 +239,8 @@ public class PcxWriter {
bos.write2Bytes(0); // vScreenSize
bos.write(new byte[54]);
- final int rgbs[] = new int[src.getWidth()];
- final byte rgbBytes[] = new byte[3 * bytesPerLine];
+ final int[] rgbs = new int[src.getWidth()];
+ final byte[] rgbBytes = new byte[3 * bytesPerLine];
for (int y = 0; y < src.getHeight(); y++) {
src.getRGB(0, y, src.getWidth(), 1, rgbs, 0, src.getWidth());
for (int x = 0; x < rgbs.length; x++) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/BitParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/BitParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/BitParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/BitParser.java Tue Nov 26 21:08:17 2013
@@ -19,11 +19,11 @@ package org.apache.commons.imaging.forma
import org.apache.commons.imaging.ImageReadException;
public class BitParser {
- private final byte bytes[];
+ private final byte[] bytes;
private final int bitsPerPixel;
private final int bitDepth;
- public BitParser(final byte bytes[], final int bitsPerPixel, final int bitDepth) {
+ public BitParser(final byte[] bytes, final int bitsPerPixel, final int bitDepth) {
this.bytes = bytes;
this.bitsPerPixel = bitsPerPixel;
this.bitDepth = bitDepth;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/GammaCorrection.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/GammaCorrection.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/GammaCorrection.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/GammaCorrection.java Tue Nov 26 21:08:17 2013
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.forma
public class GammaCorrection {
private static final boolean DEBUG = false;
- private final int lookupTable[];
+ private final int[] lookupTable;
public GammaCorrection(final double src_gamma, final double dst_gamma) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java Tue Nov 26 21:08:17 2013
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.forma
// should just use ints, not longs
public class PngCrc {
/* Table of CRCs of all 8-bit messages. */
- private final long crc_table[] = new long[256];
+ private final long[] crc_table = new long[256];
/* Flag: has the table been computed? Initially false. */
private boolean crc_table_computed = false;
@@ -49,7 +49,7 @@ public class PngCrc {
* of the final running CRC (see the crc() routine below)).
*/
- private long update_crc(final long crc, final byte buf[]) {
+ private long update_crc(final long crc, final byte[] buf) {
long c = crc;
int n;
@@ -66,15 +66,15 @@ public class PngCrc {
}
/* Return the CRC of the bytes buf[0..len-1]. */
- public final int crc(final byte buf[], final int len) {
+ public final int crc(final byte[] buf, final int len) {
return (int) (update_crc(0xffffffffL, buf) ^ 0xffffffffL);
}
- public final long start_partial_crc(final byte buf[], final int len) {
+ public final long start_partial_crc(final byte[] buf, final int len) {
return update_crc(0xffffffffL, buf);
}
- public final long continue_partial_crc(final long old_crc, final byte buf[], final int len) {
+ public final long continue_partial_crc(final long old_crc, final byte[] buf, final int len) {
return update_crc(old_crc, buf);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java Tue Nov 26 21:08:17 2013
@@ -64,7 +64,7 @@ import org.apache.commons.imaging.util.I
public class PngImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".png";
- private static final String ACCEPTED_EXTENSIONS[] = { DEFAULT_EXTENSION, };
+ private static final String[] ACCEPTED_EXTENSIONS = { DEFAULT_EXTENSION, };
@Override
public String getName() {
@@ -127,7 +127,7 @@ public class PngImageParser extends Imag
}
}
- private boolean keepChunk(final int ChunkType, final int chunkTypes[]) {
+ private boolean keepChunk(final int ChunkType, final int[] chunkTypes) {
// System.out.println("keepChunk: ");
if (chunkTypes == null) {
return true;
@@ -141,7 +141,7 @@ public class PngImageParser extends Imag
return false;
}
- private List<PngChunk> readChunks(final InputStream is, final int chunkTypes[],
+ private List<PngChunk> readChunks(final InputStream is, final int[] chunkTypes,
final boolean returnAfterFirst) throws ImageReadException, IOException {
final List<PngChunk> result = new ArrayList<PngChunk>();
@@ -159,7 +159,7 @@ public class PngImageParser extends Imag
}
final boolean keep = keepChunk(chunkType, chunkTypes);
- byte bytes[] = null;
+ byte[] bytes = null;
if (keep) {
bytes = readBytes("Chunk Data", is, length,
"Not a Valid PNG File: Couldn't read Chunk Data.");
@@ -220,7 +220,7 @@ public class PngImageParser extends Imag
}
- private List<PngChunk> readChunks(final ByteSource byteSource, final int chunkTypes[],
+ private List<PngChunk> readChunks(final ByteSource byteSource, final int[] chunkTypes,
final boolean returnAfterFirst) throws ImageReadException, IOException {
InputStream is = null;
boolean canThrow = false;
@@ -254,7 +254,7 @@ public class PngImageParser extends Imag
}
final PngChunkIccp pngChunkiCCP = (PngChunkIccp) chunks.get(0);
- final byte bytes[] = pngChunkiCCP.UncompressedProfile;
+ final byte[] bytes = pngChunkiCCP.uncompressedProfile;
return (bytes);
}
@@ -278,12 +278,12 @@ public class PngImageParser extends Imag
return new Dimension(pngChunkIHDR.width, pngChunkIHDR.height);
}
- public byte[] embedICCProfile(final byte image[], final byte profile[]) {
+ public byte[] embedICCProfile(final byte[] image, final byte[] profile) {
return null;
}
@Override
- public boolean embedICCProfile(final File src, final File dst, final byte profile[]) {
+ public boolean embedICCProfile(final File src, final File dst, final byte[] profile) {
return false;
}
@@ -577,17 +577,17 @@ public class PngImageParser extends Imag
// System.out.println("\t" + "pngChunkpHYs.PixelsPerUnitXAxis: " +
// pngChunkpHYs.PixelsPerUnitXAxis );
// }
- if ((pngChunkpHYs != null) && (pngChunkpHYs.UnitSpecifier == 1)) { // meters
+ if ((pngChunkpHYs != null) && (pngChunkpHYs.unitSpecifier == 1)) { // meters
final double meters_per_inch = 0.0254;
PhysicalWidthDpi = (int) Math
- .round(pngChunkpHYs.PixelsPerUnitXAxis
+ .round(pngChunkpHYs.pixelsPerUnitXAxis
* meters_per_inch);
- PhysicalWidthInch = (float) (Width / (pngChunkpHYs.PixelsPerUnitXAxis * meters_per_inch));
+ PhysicalWidthInch = (float) (Width / (pngChunkpHYs.pixelsPerUnitXAxis * meters_per_inch));
PhysicalHeightDpi = (int) Math
- .round(pngChunkpHYs.PixelsPerUnitYAxis
+ .round(pngChunkpHYs.pixelsPerUnitYAxis
* meters_per_inch);
- PhysicalHeightInch = (float) (Height / (pngChunkpHYs.PixelsPerUnitYAxis * meters_per_inch));
+ PhysicalHeightInch = (float) (Height / (pngChunkpHYs.pixelsPerUnitYAxis * meters_per_inch));
}
final String FormatDetails = "Png";
@@ -684,12 +684,12 @@ public class PngImageParser extends Imag
ByteArrayOutputStream baos = new ByteArrayOutputStream();
for (PngChunk IDAT : IDATs) {
final PngChunkIdat pngChunkIDAT = (PngChunkIdat) IDAT;
- final byte bytes[] = pngChunkIDAT.getBytes();
+ final byte[] bytes = pngChunkIDAT.getBytes();
// System.out.println(i + ": bytes: " + bytes.length);
baos.write(bytes);
}
- final byte compressed[] = baos.toByteArray();
+ final byte[] compressed = baos.toByteArray();
baos = null;
@@ -729,7 +729,7 @@ public class PngImageParser extends Imag
}
final PngChunkIccp pngChunkiCCP = (PngChunkIccp) iCCPs.get(0);
- final byte bytes[] = pngChunkiCCP.UncompressedProfile;
+ final byte[] bytes = pngChunkiCCP.uncompressedProfile;
icc_profile = ICC_Profile.getInstance(bytes);
} else if (gAMAs.size() == 1) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java Tue Nov 26 21:08:17 2013
@@ -68,8 +68,8 @@ public class PngWriter {
os.write(0xff & (value >> 0));
}
- private void writeChunk(final OutputStream os, final byte chunkType[],
- final byte data[]) throws IOException {
+ private void writeChunk(final OutputStream os, final byte[] chunkType,
+ final byte[] data) throws IOException {
final int dataLength = data == null ? 0 : data.length;
writeInt(os, dataLength);
os.write(chunkType);
@@ -202,7 +202,7 @@ public class PngWriter {
writeChunk(os, PngConstants.tEXt_CHUNK_TYPE.toByteArray(), baos.toByteArray());
}
- public final byte[] deflate(final byte bytes[]) throws IOException {
+ public final byte[] deflate(final byte[] bytes) throws IOException {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final DeflaterOutputStream dos = new DeflaterOutputStream(baos);
boolean canThrow = false;
@@ -251,7 +251,7 @@ public class PngWriter {
private void writeChunkPLTE(final OutputStream os, final Palette palette)
throws IOException {
final int length = palette.length();
- final byte bytes[] = new byte[length * 3];
+ final byte[] bytes = new byte[length * 3];
// Debug.debug("length", length);
for (int i = 0; i < length; i++) {
@@ -280,7 +280,7 @@ public class PngWriter {
writeChunk(os, PngConstants.IEND_CHUNK_TYPE.toByteArray(), null);
}
- private void writeChunkIDAT(final OutputStream os, final byte bytes[])
+ private void writeChunkIDAT(final OutputStream os, final byte[] bytes)
throws IOException {
writeChunk(os, PngConstants.IDAT_CHUNK_TYPE.toByteArray(), bytes);
}
@@ -595,14 +595,14 @@ public class PngWriter {
// IDAT Yes Multiple IDAT chunks shall be consecutive
- byte uncompressed[];
+ byte[] uncompressed;
{
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final boolean useAlpha = colorType == PngConstants.COLOR_TYPE_GREYSCALE_WITH_ALPHA
|| colorType == PngConstants.COLOR_TYPE_TRUE_COLOR_WITH_ALPHA;
- final int row[] = new int[width];
+ final int[] row = new int[width];
for (int y = 0; y < height; y++) {
// Debug.debug("y", y + "/" + height);
src.getRGB(0, y, width, 1, row, 0, width);
@@ -667,7 +667,7 @@ public class PngWriter {
dos.flush();
baos.flush();
- final byte compressed[] = baos.toByteArray();
+ final byte[] compressed = baos.toByteArray();
baos.reset();
if (compressed.length > 0) {
// Debug.debug("compressed", compressed.length);
@@ -677,7 +677,7 @@ public class PngWriter {
}
{
dos.finish();
- final byte compressed[] = baos.toByteArray();
+ final byte[] compressed = baos.toByteArray();
if (compressed.length > 0) {
// Debug.debug("compressed final", compressed.length);
writeChunkIDAT(os, compressed);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java Tue Nov 26 21:08:17 2013
@@ -205,24 +205,23 @@ public abstract class ScanExpediter exte
return filter;
}
- protected byte[] unfilterScanline(final int filter_type, final byte src[], final byte prev[],
+ protected byte[] unfilterScanline(final int filter_type, final byte[] src, final byte[] prev,
final int BytesPerPixel) throws ImageReadException, IOException {
final ScanlineFilter filter = getScanlineFilter(filter_type, BytesPerPixel);
- final byte dst[] = new byte[src.length];
+ final byte[] dst = new byte[src.length];
filter.unfilter(src, dst, prev);
return dst;
}
- protected byte[] getNextScanline(final InputStream is, final int length, final byte prev[],
+ protected byte[] getNextScanline(final InputStream is, final int length, final byte[] prev,
final int BytesPerPixel) throws ImageReadException, IOException {
final int filterType = is.read();
if (filterType < 0) {
throw new ImageReadException("PNG: missing filter type");
}
- final byte scanline[] = this.readBytes("scanline", is, length,
- "PNG: missing image data");
+ byte[] scanline = this.readBytes("scanline", is, length, "PNG: missing image data");
return unfilterScanline(filterType, scanline, prev, BytesPerPixel);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java Tue Nov 26 21:08:17 2013
@@ -25,10 +25,10 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.png.transparencyfilters.TransparencyFilter;
public class ScanExpediterInterlaced extends ScanExpediter {
- private static final int STARTING_ROW[] = { 0, 0, 4, 0, 2, 0, 1 };
- private static final int STARTING_COL[] = { 0, 4, 0, 2, 0, 1, 0 };
- private static final int ROW_INCREMENT[] = { 8, 8, 8, 4, 4, 2, 2 };
- private static final int COL_INCREMENT[] = { 8, 8, 4, 4, 2, 2, 1 };
+ private static final int[] STARTING_ROW = { 0, 0, 4, 0, 2, 0, 1 };
+ private static final int[] STARTING_COL = { 0, 4, 0, 2, 0, 1, 0 };
+ private static final int[] ROW_INCREMENT = { 8, 8, 8, 4, 4, 2, 2 };
+ private static final int[] COL_INCREMENT = { 8, 8, 4, 4, 2, 2, 1 };
// private static final int Block_Height[] = { 8, 8, 4, 4, 2, 2, 1 };
// private static final int Block_Width[] = { 8, 4, 4, 2, 2, 1, 1 };
@@ -54,7 +54,7 @@ public class ScanExpediterInterlaced ext
int pass = 1;
while (pass <= 7) {
- byte prev[] = null;
+ byte[] prev = null;
int y = STARTING_ROW[pass - 1];
// int y_stride = ROW_INCREMENT[pass - 1];
@@ -69,7 +69,7 @@ public class ScanExpediterInterlaced ext
final int bitsPerScanLine = bitsPerPixel * ColumnsInRow;
final int pixel_bytes_per_scan_line = getBitsToBytesRoundingUp(bitsPerScanLine);
- final byte unfiltered[] = getNextScanline(is,
+ final byte[] unfiltered = getNextScanline(is,
pixel_bytes_per_scan_line, prev, bytesPerPixel);
prev = unfiltered;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java Tue Nov 26 21:08:17 2013
@@ -39,10 +39,10 @@ public class ScanExpediterSimple extends
public void drive() throws ImageReadException, IOException {
final int bitsPerScanLine = bitsPerPixel * width;
final int pixelBytesPerScanLine = getBitsToBytesRoundingUp(bitsPerScanLine);
- byte prev[] = null;
+ byte[] prev = null;
for (int y = 0; y < height; y++) {
- final byte unfiltered[] = getNextScanline(is, pixelBytesPerScanLine,
+ final byte[] unfiltered = getNextScanline(is, pixelBytesPerScanLine,
prev, bytesPerPixel);
prev = unfiltered;