You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2021/07/02 21:16:45 UTC
[commons-imaging] branch master updated: Simplify conditions and
avoid extra checks.
This is an automated email from the ASF dual-hosted git repository.
kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new c4a62e5 Simplify conditions and avoid extra checks.
c4a62e5 is described below
commit c4a62e53b1d31fd2c1b1e0367947b9cadf11ceeb
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Tue Jun 15 18:21:48 2021 +0200
Simplify conditions and avoid extra checks.
---
.../imaging/formats/bmp/BmpImageParser.java | 11 --------
.../imaging/formats/gif/GifImageParser.java | 32 ++--------------------
.../imaging/formats/jpeg/iptc/IptcParser.java | 4 +--
.../imaging/formats/png/PngImageParser.java | 20 ++++++--------
.../imaging/formats/pnm/PnmImageParser.java | 8 ------
.../imaging/formats/psd/PsdImageParser.java | 19 ++-----------
.../imaging/formats/tiff/TiffDirectory.java | 3 +-
.../imaging/formats/tiff/TiffImageParser.java | 10 ++-----
.../formats/tiff/datareaders/DataReaderStrips.java | 2 --
.../tiff/write/TiffImageWriterLossless.java | 3 +-
.../commons/imaging/icc/IccProfileParser.java | 3 +-
.../org/apache/commons/imaging/icc/IccTag.java | 2 +-
12 files changed, 21 insertions(+), 96 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
index 99d12e2..23859e2 100644
--- a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
@@ -503,10 +503,6 @@ public class BmpImageParser extends ImageParser {
final BmpHeaderInfo bhi = readBmpHeaderInfo(byteSource);
- if (bhi == null) {
- throw new ImageReadException("BMP: couldn't read header");
- }
-
return new Dimension(bhi.width, bhi.height);
}
@@ -557,10 +553,6 @@ public class BmpImageParser extends ImageParser {
ic = readImageContents(is, FormatCompliance.getDefault());
}
- if (ic == null) {
- throw new ImageReadException("Couldn't read BMP Data");
- }
-
final BmpHeaderInfo bhi = ic.bhi;
final byte[] colorTable = ic.colorTable;
@@ -658,9 +650,6 @@ public class BmpImageParser extends ImageParser {
}
final BmpImageContents ic = readImageContents(inputStream, FormatCompliance.getDefault());
- if (ic == null) {
- throw new ImageReadException("Couldn't read BMP Data");
- }
final BmpHeaderInfo bhi = ic.bhi;
// byte colorTable[] = ic.colorTable;
diff --git a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
index fb3a7d7..105db38 100644
--- a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
@@ -298,12 +298,7 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable {
completeCode);
}
- // if (label == new String("ICCRGBG1"))
- //{
- // GIF's can have embedded ICC Profiles - who knew?
- //}
-
- if ((label != null) && (label.length > 0)) {
+ if (label.length > 0) {
final GenericGifBlock block = readGenericGIFBlock(is,
completeCode, label);
result.add(block);
@@ -491,10 +486,6 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable {
throws ImageReadException, IOException {
final GifImageContents blocks = readFile(byteSource, false);
- if (blocks == null) {
- throw new ImageReadException("GIF: Couldn't read blocks");
- }
-
final GifHeaderInfo bhi = blocks.gifHeaderInfo;
if (bhi == null) {
throw new ImageReadException("GIF: Couldn't read Header");
@@ -537,10 +528,6 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable {
throws ImageReadException, IOException {
final GifImageContents imageContents = readFile(byteSource, false);
- if (imageContents == null) {
- throw new ImageReadException("GIF: Couldn't read blocks");
- }
-
final GifHeaderInfo bhi = imageContents.gifHeaderInfo;
if (bhi == null) {
throw new ImageReadException("GIF: Couldn't read Header");
@@ -574,10 +561,6 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable {
throws ImageReadException, IOException {
final GifImageContents blocks = readFile(byteSource, false);
- if (blocks == null) {
- throw new ImageReadException("GIF: Couldn't read blocks");
- }
-
final GifHeaderInfo bhi = blocks.gifHeaderInfo;
if (bhi == null) {
throw new ImageReadException("GIF: Couldn't read Header");
@@ -818,10 +801,6 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable {
throws ImageReadException, IOException {
final GifImageContents imageContents = readFile(byteSource, false);
- if (imageContents == null) {
- throw new ImageReadException("GIF: Couldn't read blocks");
- }
-
final GifHeaderInfo ghi = imageContents.gifHeaderInfo;
if (ghi == null) {
throw new ImageReadException("GIF: Couldn't read Header");
@@ -840,10 +819,6 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable {
throws ImageReadException, IOException {
final GifImageContents imageContents = readFile(byteSource, false);
- if (imageContents == null) {
- throw new ImageReadException("GIF: Couldn't read blocks");
- }
-
final GifHeaderInfo ghi = imageContents.gifHeaderInfo;
if (ghi == null) {
throw new ImageReadException("GIF: Couldn't read Header");
@@ -1113,14 +1088,13 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable {
public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
try (InputStream is = byteSource.getInputStream()) {
- final FormatCompliance formatCompliance = null;
- final GifHeaderInfo ghi = readHeader(is, formatCompliance);
+ final GifHeaderInfo ghi = readHeader(is, null);
if (ghi.globalColorTableFlag) {
readColorTable(is, ghi.sizeOfGlobalColorTable);
}
- final List<GifBlock> blocks = readBlocks(ghi, is, true, formatCompliance);
+ final List<GifBlock> blocks = readBlocks(ghi, is, true, null);
final List<String> result = new ArrayList<>();
for (final GifBlock block : blocks) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
index 6cde3dd..f5c2adc 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
@@ -428,11 +428,11 @@ public class IptcParser extends BinaryFileParser {
byte[] blockData;
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
try (BinaryOutputStream bos = new BinaryOutputStream(baos, getByteOrder())) {
- if (charset != null && !charset.equals(DEFAULT_CHARSET)) {
+ if (!charset.equals(DEFAULT_CHARSET)) {
bos.write(IptcConstants.IPTC_RECORD_TAG_MARKER);
bos.write(IptcConstants.IPTC_ENVELOPE_RECORD_NUMBER);
bos.write(ENV_TAG_CODED_CHARACTER_SET);
- byte[] codedCharset = charset.equals(StandardCharsets.UTF_8) ? CHARACTER_ESCAPE_SEQUENCE: charset.name().getBytes(StandardCharsets.ISO_8859_1);
+ byte[] codedCharset = CHARACTER_ESCAPE_SEQUENCE;
bos.write2Bytes(codedCharset.length);
bos.write(codedCharset);
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
index 9cb5650..efacb59 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
@@ -243,8 +243,7 @@ public class PngImageParser extends ImageParser implements XmpEmbeddable {
final List<PngChunk> chunks = readChunks(byteSource, new ChunkType[] { ChunkType.iCCP },
true);
- if ((chunks == null) || (chunks.isEmpty())) {
- // throw new ImageReadException("Png: No chunks");
+ if (chunks.isEmpty()) {
return null;
}
@@ -264,7 +263,7 @@ public class PngImageParser extends ImageParser implements XmpEmbeddable {
throws ImageReadException, IOException {
final List<PngChunk> chunks = readChunks(byteSource, new ChunkType[] { ChunkType.IHDR, }, true);
- if ((chunks == null) || (chunks.isEmpty())) {
+ if (chunks.isEmpty()) {
throw new ImageReadException("Png: No chunks");
}
@@ -282,7 +281,7 @@ public class PngImageParser extends ImageParser implements XmpEmbeddable {
throws ImageReadException, IOException {
final List<PngChunk> chunks = readChunks(byteSource, new ChunkType[] { ChunkType.tEXt, ChunkType.zTXt, }, false);
- if ((chunks == null) || (chunks.isEmpty())) {
+ if (chunks.isEmpty()) {
return null;
}
@@ -343,10 +342,7 @@ public class PngImageParser extends ImageParser implements XmpEmbeddable {
ChunkType.iTXt,
}, false);
- // if(chunks!=null)
- // System.out.println("chunks: " + chunks.size());
-
- if ((chunks == null) || (chunks.isEmpty())) {
+ if (chunks.isEmpty()) {
throw new ImageReadException("PNG: no chunks");
}
@@ -506,7 +502,7 @@ public class PngImageParser extends ImageParser implements XmpEmbeddable {
ChunkType.sRGB,
}, false);
- if ((chunks == null) || (chunks.isEmpty())) {
+ if (chunks.isEmpty()) {
throw new ImageReadException("PNG: no chunks");
}
@@ -653,8 +649,8 @@ public class PngImageParser extends ImageParser implements XmpEmbeddable {
scanExpediter.drive();
if (iccProfile != null) {
- final Boolean is_srgb = new IccProfileParser().issRGB(iccProfile);
- if (is_srgb == null || !is_srgb.booleanValue()) {
+ final boolean is_srgb = new IccProfileParser().issRGB(iccProfile);
+ if (!is_srgb) {
final ICC_ColorSpace cs = new ICC_ColorSpace(iccProfile);
final ColorModel srgbCM = ColorModel.getRGBdefault();
@@ -721,7 +717,7 @@ public class PngImageParser extends ImageParser implements XmpEmbeddable {
final List<PngChunk> chunks = readChunks(byteSource, new ChunkType[] { ChunkType.iTXt }, false);
- if ((chunks == null) || (chunks.isEmpty())) {
+ if (chunks.isEmpty()) {
return null;
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
index 2c661a9..bcba04a 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
@@ -233,10 +233,6 @@ public class PnmImageParser extends ImageParser {
throws ImageReadException, IOException {
final FileInfo info = readHeader(byteSource);
- if (info == null) {
- throw new ImageReadException("PNM: Couldn't read Header");
- }
-
return new Dimension(info.width, info.height);
}
@@ -251,10 +247,6 @@ public class PnmImageParser extends ImageParser {
throws ImageReadException, IOException {
final FileInfo info = readHeader(byteSource);
- if (info == null) {
- throw new ImageReadException("PNM: Couldn't read Header");
- }
-
final List<String> comments = new ArrayList<>();
final int bitsPerPixel = info.getBitDepth() * info.getNumComponents();
diff --git a/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java b/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
index d26d7fb..997fb42 100644
--- a/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
@@ -386,7 +386,7 @@ public class PsdImageParser extends ImageParser implements XmpEmbeddable {
final List<ImageResourceBlock> blocks = readImageResourceBlocks(byteSource,
new int[] { IMAGE_RESOURCE_ID_ICC_PROFILE, }, 1);
- if ((blocks == null) || (blocks.isEmpty())) {
+ if (blocks.isEmpty()) {
return null;
}
@@ -402,9 +402,6 @@ public class PsdImageParser extends ImageParser implements XmpEmbeddable {
public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final PsdHeaderInfo bhi = readHeader(byteSource);
- if (bhi == null) {
- throw new ImageReadException("PSD: couldn't read header");
- }
return new Dimension(bhi.columns, bhi.rows);
@@ -446,10 +443,6 @@ public class PsdImageParser extends ImageParser implements XmpEmbeddable {
final PsdImageContents imageContents = readImageContents(byteSource);
// ImageContents imageContents = readImage(byteSource, false);
- if (imageContents == null) {
- throw new ImageReadException("PSD: Couldn't read blocks");
- }
-
final PsdHeaderInfo header = imageContents.header;
if (header == null) {
throw new ImageReadException("PSD: Couldn't read Header");
@@ -557,10 +550,6 @@ public class PsdImageParser extends ImageParser implements XmpEmbeddable {
final PsdImageContents imageContents = readImageContents(byteSource);
// ImageContents imageContents = readImage(byteSource, false);
- if (imageContents == null) {
- throw new ImageReadException("PSD: Couldn't read blocks");
- }
-
final PsdHeaderInfo header = imageContents.header;
if (header == null) {
throw new ImageReadException("PSD: Couldn't read Header");
@@ -673,10 +662,6 @@ public class PsdImageParser extends ImageParser implements XmpEmbeddable {
final PsdImageContents imageContents = readImageContents(byteSource);
- if (imageContents == null) {
- throw new ImageReadException("PSD: Couldn't read blocks");
- }
-
final PsdHeaderInfo header = imageContents.header;
if (header == null) {
throw new ImageReadException("PSD: Couldn't read Header");
@@ -685,7 +670,7 @@ public class PsdImageParser extends ImageParser implements XmpEmbeddable {
final List<ImageResourceBlock> blocks = readImageResourceBlocks(byteSource,
new int[] { IMAGE_RESOURCE_ID_XMP, }, -1);
- if ((blocks == null) || (blocks.isEmpty())) {
+ if (blocks.isEmpty()) {
return null;
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
index ba9407a..e84f780 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
@@ -216,8 +216,7 @@ public class TiffDirectory extends TiffElement {
*/
public BufferedImage getTiffImage(final ByteOrder byteOrder) throws ImageReadException,
IOException {
- final Map<String, Object> params = null;
- return getTiffImage(byteOrder, params);
+ return getTiffImage(byteOrder, null);
}
/**
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
index 58af805..1418b4f 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
@@ -347,16 +347,11 @@ public class TiffImageParser extends ImageParser implements XmpEmbeddable {
// try
{
final FormatCompliance formatCompliance = FormatCompliance.getDefault();
- final Map<String, Object> params = null;
final TiffContents contents = new TiffReader(true).readContents(
- byteSource, params, formatCompliance);
+ byteSource, null, formatCompliance);
final List<TiffDirectory> directories = contents.directories;
- if (directories == null) {
- return false;
- }
-
for (int d = 0; d < directories.size(); d++) {
final TiffDirectory directory = directories.get(d);
@@ -392,8 +387,7 @@ public class TiffImageParser extends ImageParser implements XmpEmbeddable {
public FormatCompliance getFormatCompliance(final ByteSource byteSource)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance = FormatCompliance.getDefault();
- final Map<String, Object> params = null;
- new TiffReader(isStrict(params)).readContents(byteSource, params,
+ new TiffReader(isStrict(null)).readContents(byteSource, null,
formatCompliance);
return formatCompliance;
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
index ac185c3..6f3a159 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
@@ -186,7 +186,6 @@ public final class DataReaderStrips extends ImageDataReader {
if (bitsPerPixel == 24) {
// 24 bit case, we don't mask the red byte because any
// sign-extended bits get covered by opacity mask
- k = 0;
for (int i = i0; i < i1; i++) {
for (int j = 0; j < width; j++, k += 3) {
final int rgb = 0xff000000
@@ -199,7 +198,6 @@ public final class DataReaderStrips extends ImageDataReader {
} else {
// 32 bit case, we don't mask the high byte because any
// sign-extended bits get shifted up and out of result
- k = 0;
for (int i = i0; i < i1; i++) {
for (int j = 0; j < width; j++, k += 4) {
final int rgb
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
index 46d9f64..b98fb53 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
@@ -63,10 +63,9 @@ public class TiffImageWriterLossless extends TiffImageWriterBase {
IOException {
try {
final ByteSource byteSource = new ByteSourceArray(exifBytes);
- final Map<String, Object> params = null;
final FormatCompliance formatCompliance = FormatCompliance.getDefault();
final TiffContents contents = new TiffReader(false).readContents(
- byteSource, params, formatCompliance);
+ byteSource, null, formatCompliance);
final List<TiffElement> elements = new ArrayList<>();
diff --git a/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java b/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java
index dd8143d..b650168 100644
--- a/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java
+++ b/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java
@@ -194,7 +194,6 @@ public class IccProfileParser extends BinaryFileParser {
printCharQuad("ProfileCreatorSignature", profileCreatorSignature);
}
- final byte[] profileId = null;
skipBytes(is, 16, "Not a Valid ICC Profile");
// readByteArray("ProfileID", 16, is,
// "Not a Valid ICC Profile");
@@ -258,7 +257,7 @@ public class IccProfileParser extends BinaryFileParser {
profileConnectionSpace, profileFileSignature,
primaryPlatformSignature, variousFlags, deviceManufacturer,
deviceModel, renderingIntent, profileCreatorSignature,
- profileId, tags);
+ null, tags);
if (LOGGER.isLoggable(Level.FINEST)) {
LOGGER.finest("issRGB: " + result.issRGB());
diff --git a/src/main/java/org/apache/commons/imaging/icc/IccTag.java b/src/main/java/org/apache/commons/imaging/icc/IccTag.java
index 5c9fcd5..eea0470 100644
--- a/src/main/java/org/apache/commons/imaging/icc/IccTag.java
+++ b/src/main/java/org/apache/commons/imaging/icc/IccTag.java
@@ -98,7 +98,7 @@ public class IccTag {
+ ")");
if (data == null) {
- pw.println(prefix + "data: " + Arrays.toString(data));
+ pw.println(prefix + "data: " + Arrays.toString((byte[]) null));
} else {
pw.println(prefix + "data: " + data.length);