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/25 14:11:20 UTC
svn commit: r1545249 - in
/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging: ./
formats/png/ formats/png/chunks/ formats/png/transparencyfilters/
formats/pnm/ formats/psd/ formats/psd/dataparsers/ formats/tiff/
formats/tiff/datarea...
Author: ebourg
Date: Mon Nov 25 13:11:20 2013
New Revision: 1545249
URL: http://svn.apache.org/r1545249
Log:
Removed redundant local variables
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ColorTools.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/GammaCorrection.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColor.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileInfo.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ColorTools.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ColorTools.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ColorTools.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ColorTools.java Mon Nov 25 13:11:20 2013
@@ -50,8 +50,7 @@ public class ColorTools {
final ICC_ColorSpace cs = new ICC_ColorSpace(icc);
- final BufferedImage dst = convertFromColorSpace(src, cs);
- return dst;
+ return convertFromColorSpace(src, cs);
}
public BufferedImage relabelColorSpace(final BufferedImage bi, final ICC_Profile profile)
@@ -83,10 +82,7 @@ public class ColorTools {
// use this when the image is mislabeled, presumably having been
// wrongly assumed to be sRGB
- final BufferedImage result = new BufferedImage(cm, bi.getRaster(), false,
- null);
-
- return result;
+ return new BufferedImage(cm, bi.getRaster(), false, null);
}
public ColorModel deriveColorModel(final BufferedImage bi, final ColorSpace cs)
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java Mon Nov 25 13:11:20 2013
@@ -95,7 +95,8 @@ public abstract class ImageParser extend
* @return A valid array of image parsers
*/
public static ImageParser[] getAllImageParsers() {
- final ImageParser result[] = {
+
+ return new ImageParser[]{
new BmpImageParser(),
new DcxImageParser(),
new GifImageParser(),
@@ -111,11 +112,9 @@ public abstract class ImageParser extend
new WbmpImageParser(),
new XbmImageParser(),
new XpmImageParser(),
- // new JBig2ImageParser(),
- // new TgaImageParser(),
+ // new JBig2ImageParser(),
+ // new TgaImageParser(),
};
-
- return result;
}
/**
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java Mon Nov 25 13:11:20 2013
@@ -437,8 +437,7 @@ public abstract class Imaging implements
return null;
}
- final ICC_Profile icc = ICC_Profile.getInstance(bytes);
- return icc;
+ return ICC_Profile.getInstance(bytes);
}
/**
@@ -700,9 +699,7 @@ public abstract class Imaging implements
throws ImageReadException, IOException {
final ImageParser imageParser = getImageParser(byteSource);
- final ImageInfo imageInfo = imageParser.getImageInfo(byteSource, params);
-
- return imageInfo;
+ return imageParser.getImageInfo(byteSource, params);
}
private static ImageParser getImageParser(final ByteSource byteSource)
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=1545249&r1=1545248&r2=1545249&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 Mon Nov 25 13:11:20 2013
@@ -52,10 +52,7 @@ public class GammaCorrection {
green = correctSample(green);
blue = correctSample(blue);
- final int rgb = alpha | ((0xff & red) << 16) | ((0xff & green) << 8)
- | ((0xff & blue) << 0);
-
- return rgb;
+ return alpha | ((0xff & red) << 16) | ((0xff & green) << 8) | ((0xff & blue) << 0);
}
private int correctSample(final int sample, final double src_gamma, final double dst_gamma) {
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=1545249&r1=1545248&r2=1545249&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 Mon Nov 25 13:11:20 2013
@@ -148,9 +148,7 @@ public abstract class ScanExpediter exte
sample = gammaCorrection.correctSample(sample);
}
- final int rgb = getPixelARGB(alpha, sample, sample, sample);
- return rgb;
-
+ return getPixelARGB(alpha, sample, sample, sample);
}
case 6: {
// 8,16 Each pixel is an R,G,B triple,
@@ -165,8 +163,7 @@ public abstract class ScanExpediter exte
blue = gammaCorrection.correctSample(blue);
}
- final int rgb = getPixelARGB(alpha, red, green, blue);
- return rgb;
+ return getPixelARGB(alpha, red, green, blue);
}
default:
throw new ImageReadException("PNG: unknown color type: "
@@ -227,10 +224,7 @@ public abstract class ScanExpediter exte
final byte scanline[] = this.readBytes("scanline", is, length,
"PNG: missing image data");
- final byte unfiltered[] = unfilterScanline(filterType, scanline, prev,
- BytesPerPixel);
-
- return unfiltered;
+ return unfilterScanline(filterType, scanline, prev, BytesPerPixel);
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java Mon Nov 25 13:11:20 2013
@@ -59,8 +59,7 @@ public class PngChunk extends BinaryFile
}
protected ByteArrayInputStream getDataStream() {
- final ByteArrayInputStream is = new ByteArrayInputStream(getBytes());
- return is;
+ return new ByteArrayInputStream(getBytes());
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColor.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColor.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColor.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColor.java Mon Nov 25 13:11:20 2013
@@ -27,21 +27,17 @@ public class TransparencyFilterIndexedCo
}
@Override
- public int filter(final int rgb, final int index) throws ImageReadException,
- IOException {
+ public int filter(final int rgb, final int index) throws ImageReadException, IOException {
if (index >= bytes.length) {
return rgb;
}
if ((index < 0) || (index > bytes.length)) {
throw new ImageReadException(
- "TransparencyFilterIndexedColor index: " + index
- + ", bytes.length: " + bytes.length);
+ "TransparencyFilterIndexedColor index: " + index + ", bytes.length: " + bytes.length);
}
final int alpha = bytes[index];
- final int result = ((0xff & alpha) << 24) | (0x00ffffff & rgb);
-
- return result;
+ return ((0xff & alpha) << 24) | (0x00ffffff & rgb);
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java Mon Nov 25 13:11:20 2013
@@ -136,13 +136,13 @@ public class PamFileInfo extends FileInf
alpha = scaleSample(alpha, scale, maxval);
}
- final int rgb = ((0xff & alpha) << 24) | ((0xff & sample) << 16)
- | ((0xff & sample) << 8) | ((0xff & sample) << 0);
-
- return rgb;
+ return ((0xff & alpha) << 24)
+ | ((0xff & sample) << 16)
+ | ((0xff & sample) << 8)
+ | ((0xff & sample) << 0);
}
}
-
+
private class ColorTupleReader extends TupleReader {
@Override
public int getColorType() {
@@ -165,10 +165,10 @@ public class PamFileInfo extends FileInf
alpha = scaleSample(alpha, scale, maxval);
}
- final int rgb = ((0xff & alpha) << 24) | ((0xff & red) << 16)
- | ((0xff & green) << 8) | ((0xff & blue) << 0);
-
- return rgb;
+ return ((0xff & alpha) << 24)
+ | ((0xff & red) << 16)
+ | ((0xff & green) << 8)
+ | ((0xff & blue) << 0);
}
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java Mon Nov 25 13:11:20 2013
@@ -90,10 +90,10 @@ public class PgmFileInfo extends FileInf
final int alpha = 0xff;
- final int rgb = ((0xff & alpha) << 24) | ((0xff & sample) << 16)
- | ((0xff & sample) << 8) | ((0xff & sample) << 0);
-
- return rgb;
+ return ((0xff & alpha) << 24)
+ | ((0xff & sample) << 16)
+ | ((0xff & sample) << 8)
+ | ((0xff & sample) << 0);
}
@Override
@@ -104,10 +104,10 @@ public class PgmFileInfo extends FileInf
final int alpha = 0xff;
- final int rgb = ((0xff & alpha) << 24) | ((0xff & sample) << 16)
- | ((0xff & sample) << 8) | ((0xff & sample) << 0);
-
- return rgb;
+ return ((0xff & alpha) << 24)
+ | ((0xff & sample) << 16)
+ | ((0xff & sample) << 8)
+ | ((0xff & sample) << 0);
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java Mon Nov 25 13:11:20 2013
@@ -264,13 +264,11 @@ public class PnmImageParser extends Imag
final int ColorType = info.getColorType();
final String compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_NONE;
- final ImageInfo result = new ImageInfo(FormatDetails, BitsPerPixel, Comments,
+ return new ImageInfo(FormatDetails, BitsPerPixel, Comments,
Format, FormatName, info.height, MimeType, NumberOfImages,
PhysicalHeightDpi, PhysicalHeightInch, PhysicalWidthDpi,
PhysicalWidthInch, info.width, isProgressive, isTransparent,
usesPalette, ColorType, compressionAlgorithm);
-
- return result;
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java Mon Nov 25 13:11:20 2013
@@ -93,10 +93,10 @@ public class PpmFileInfo extends FileInf
blue = scaleSample(blue, scale, max);
final int alpha = 0xff;
- final int rgb = ((0xff & alpha) << 24) | ((0xff & red) << 16)
- | ((0xff & green) << 8) | ((0xff & blue) << 0);
-
- return rgb;
+ return ((0xff & alpha) << 24)
+ | ((0xff & red) << 16)
+ | ((0xff & green) << 8)
+ | ((0xff & blue) << 0);
}
@Override
@@ -110,9 +110,9 @@ public class PpmFileInfo extends FileInf
blue = scaleSample(blue, scale, max);
final int alpha = 0xff;
- final int rgb = ((0xff & alpha) << 24) | ((0xff & red) << 16)
- | ((0xff & green) << 8) | ((0xff & blue) << 0);
-
- return rgb;
+ return ((0xff & alpha) << 24)
+ | ((0xff & red) << 16)
+ | ((0xff & green) << 8)
+ | ((0xff & blue) << 0);
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java Mon Nov 25 13:11:20 2013
@@ -119,10 +119,7 @@ public class PsdImageParser extends Imag
final int Depth = read2Bytes("Depth", is, "Not a Valid PSD File");
final int Mode = read2Bytes("Mode", is, "Not a Valid PSD File");
- final PsdHeaderInfo result = new PsdHeaderInfo(Version, Reserved, Channels,
- Rows, Columns, Depth, Mode);
-
- return result;
+ return new PsdHeaderInfo(Version, Reserved, Channels, Rows, Columns, Depth, Mode);
}
private ImageContents readImageContents(final InputStream is)
@@ -158,15 +155,13 @@ public class PsdImageParser extends Imag
// System.out.println("Compression: " + Compression);
- final ImageContents result = new ImageContents(header, ColorModeDataLength,
+ return new ImageContents(header, ColorModeDataLength,
// ColorModeData,
ImageResourcesLength,
// ImageResources,
LayerAndMaskDataLength,
// LayerAndMaskData,
Compression);
-
- return result;
}
private List<ImageResourceBlock> readImageResourceBlocks(final byte bytes[],
@@ -554,13 +549,11 @@ public class PsdImageParser extends Imag
compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_UNKNOWN;
}
- final ImageInfo result = new ImageInfo(FormatDetails, BitsPerPixel, Comments,
+ return new ImageInfo(FormatDetails, BitsPerPixel, Comments,
Format, FormatName, Height, MimeType, NumberOfImages,
PhysicalHeightDpi, PhysicalHeightInch, PhysicalWidthDpi,
PhysicalWidthInch, Width, isProgressive, isTransparent,
usesPalette, ColorType, compressionAlgorithm);
-
- return result;
}
// // TODO not used
@@ -793,8 +786,7 @@ public class PsdImageParser extends Imag
try {
// segment data is UTF-8 encoded xml.
- final String xml = new String(block.data, 0, block.data.length, "utf-8");
- return xml;
+ return new String(block.data, 0, block.data.length, "utf-8");
} catch (final UnsupportedEncodingException e) {
throw new ImageReadException("Invalid JPEG XMP Segment.", e);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java Mon Nov 25 13:11:20 2013
@@ -32,10 +32,10 @@ public class DataParserBitmap extends Da
// sample = 255- sample;
final int alpha = 0xff;
- final int rgb = ((0xff & alpha) << 24) | ((0xff & sample) << 16)
- | ((0xff & sample) << 8) | ((0xff & sample) << 0);
-
- return rgb;
+ return ((0xff & alpha) << 24)
+ | ((0xff & sample) << 16)
+ | ((0xff & sample) << 8)
+ | ((0xff & sample) << 0);
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java Mon Nov 25 13:11:20 2013
@@ -34,9 +34,7 @@ public class DataParserCmyk extends Data
sy = 255 - sy;
sk = 255 - sk;
- final int rgb = ColorConversions.convertCMYKtoRGB(sc, sm, sy, sk);
-
- return rgb;
+ return ColorConversions.convertCMYKtoRGB(sc, sm, sy, sk);
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java Mon Nov 25 13:11:20 2013
@@ -25,10 +25,10 @@ public class DataParserGrayscale extends
final int sample = 0xff & data[0][y][x];
final int alpha = 0xff;
- final int rgb = ((0xff & alpha) << 24) | ((0xff & sample) << 16)
- | ((0xff & sample) << 8) | ((0xff & sample) << 0);
-
- return rgb;
+ return ((0xff & alpha) << 24)
+ | ((0xff & sample) << 16)
+ | ((0xff & sample) << 8)
+ | ((0xff & sample) << 0);
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java Mon Nov 25 13:11:20 2013
@@ -37,12 +37,9 @@ public class DataParserIndexed extends D
}
@Override
- protected int getRGB(final int data[][][], final int x, final int y,
- final ImageContents imageContents) {
+ protected int getRGB(final int data[][][], final int x, final int y, final ImageContents imageContents) {
final int sample = 0xff & data[0][y][x];
- final int rgb = ColorTable[sample];
-
- return rgb;
+ return ColorTable[sample];
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java Mon Nov 25 13:11:20 2013
@@ -22,8 +22,7 @@ import org.apache.commons.imaging.format
public class DataParserLab extends DataParser {
@Override
- protected int getRGB(final int data[][][], final int x, final int y,
- final ImageContents imageContents) {
+ protected int getRGB(final int data[][][], final int x, final int y, final ImageContents imageContents) {
final int cieL = 0xff & data[0][y][x];
int cieA = 0xff & data[1][y][x];
int cieB = 0xff & data[2][y][x];
@@ -31,9 +30,7 @@ public class DataParserLab extends DataP
cieA -= 128;
cieB -= 128;
- final int rgb = ColorConversions.convertCIELabtoARGBTest(cieL, cieA, cieB);
-
- return rgb;
+ return ColorConversions.convertCIELabtoARGBTest(cieL, cieA, cieB);
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java Mon Nov 25 13:11:20 2013
@@ -27,10 +27,10 @@ public class DataParserRgb extends DataP
final int blue = 0xff & data[2][y][x];
final int alpha = 0xff;
- final int rgb = ((0xff & alpha) << 24) | ((0xff & red) << 16)
- | ((0xff & green) << 8) | ((0xff & blue) << 0);
-
- return rgb;
+ return ((0xff & alpha) << 24)
+ | ((0xff & red) << 16)
+ | ((0xff & green) << 8)
+ | ((0xff & blue) << 0);
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java Mon Nov 25 13:11:20 2013
@@ -303,8 +303,7 @@ public class TiffField {
return TiffTagConstants.TIFF_TAG_UNKNOWN;
}
- final TagInfo result = getTag(directoryType, possibleMatches);
- return result;
+ return getTag(directoryType, possibleMatches);
}
public String getValueDescription() {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java Mon Nov 25 13:11:20 2013
@@ -419,8 +419,7 @@ public class TiffReader extends BinaryFi
final Collector collector = new Collector(params);
read(byteSource, params, formatCompliance, collector);
- final TiffContents contents = collector.getContents();
- return contents;
+ return collector.getContents();
}
public void read(final ByteSource byteSource, final Map<String,Object> params,
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java Mon Nov 25 13:11:20 2013
@@ -189,22 +189,16 @@ public abstract class DataReader impleme
myLzwDecompressor.setTiffLZWMode();
- final byte[] result = myLzwDecompressor.decompress(is, expected_size);
-
- return result;
+ return myLzwDecompressor.decompress(is, expected_size);
}
case TIFF_COMPRESSION_PACKBITS: // Packbits
{
- final byte unpacked[] = new PackBits().decompress(compressed,
- expected_size);
-
- return unpacked;
+ return new PackBits().decompress(compressed, expected_size);
}
default:
- throw new ImageReadException(
- "Tiff: unknown/unsupported compression: " + compression);
+ throw new ImageReadException("Tiff: unknown/unsupported compression: " + compression);
}
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java Mon Nov 25 13:11:20 2013
@@ -279,16 +279,12 @@ public class XbmImageParser extends Imag
}
}
- final int[] palette = { 0xffffff, 0x000000 };
- final ColorModel colorModel = new IndexColorModel(1, 2, palette, 0, false,
- -1, DataBuffer.TYPE_BYTE);
- final DataBufferByte dataBuffer = new DataBufferByte(imageData,
- imageData.length);
- final WritableRaster raster = Raster.createPackedRaster(dataBuffer,
- xbmHeader.width, xbmHeader.height, 1, null);
- final BufferedImage image = new BufferedImage(colorModel, raster,
- colorModel.isAlphaPremultiplied(), new Properties());
- return image;
+ int[] palette = { 0xffffff, 0x000000 };
+ ColorModel colorModel = new IndexColorModel(1, 2, palette, 0, false, -1, DataBuffer.TYPE_BYTE);
+ DataBufferByte dataBuffer = new DataBufferByte(imageData, imageData.length);
+ WritableRaster raster = Raster.createPackedRaster(dataBuffer, xbmHeader.width, xbmHeader.height, 1, null);
+
+ return new BufferedImage(colorModel, raster, colorModel.isAlphaPremultiplied(), new Properties());
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileInfo.java?rev=1545249&r1=1545248&r2=1545249&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileInfo.java Mon Nov 25 13:11:20 2013
@@ -81,8 +81,8 @@ public class IccProfileInfo {
}
public boolean issRGB() {
- final boolean result = ((DeviceManufacturer == IccConstants.IEC) && (DeviceModel == IccConstants.sRGB));
- return result;
+ return DeviceManufacturer == IccConstants.IEC
+ && DeviceModel == IccConstants.sRGB;
}
private void printCharQuad(final PrintWriter pw, final String msg, final int i) {