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 2022/02/05 21:26:22 UTC
[commons-imaging] branch master updated: Simplify conditional expression.
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 a86c5a5 Simplify conditional expression.
a86c5a5 is described below
commit a86c5a5a550aa5303c2fa28c4e5ff0925f7174a9
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sat Feb 5 21:46:09 2022 +0100
Simplify conditional expression.
---
.../org/apache/commons/imaging/formats/tiff/TiffImageParser.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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 ac4fe02..e0d1d14 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
@@ -97,7 +97,7 @@ public class TiffImageParser extends ImageParser<TiffImagingParameters> implemen
public byte[] getICCProfileBytes(final ByteSource byteSource, final TiffImagingParameters params)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance = FormatCompliance.getDefault();
- final TiffContents contents = new TiffReader(params != null ? params.isStrict() : false).readFirstDirectory(
+ final TiffContents contents = new TiffReader(params != null && params.isStrict()).readFirstDirectory(
byteSource, false, formatCompliance);
final TiffDirectory directory = contents.directories.get(0);
@@ -109,7 +109,7 @@ public class TiffImageParser extends ImageParser<TiffImagingParameters> implemen
public Dimension getImageSize(final ByteSource byteSource, final TiffImagingParameters params)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance = FormatCompliance.getDefault();
- final TiffContents contents = new TiffReader(params != null ? params.isStrict() : false)
+ final TiffContents contents = new TiffReader(params != null && params.isStrict())
.readFirstDirectory(byteSource, false, formatCompliance);
final TiffDirectory directory = contents.directories.get(0);
@@ -162,7 +162,7 @@ public class TiffImageParser extends ImageParser<TiffImagingParameters> implemen
public ImageInfo getImageInfo(final ByteSource byteSource, final TiffImagingParameters params)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance = FormatCompliance.getDefault();
- final TiffContents contents = new TiffReader(params != null ? params.isStrict() : false).readDirectories(
+ final TiffContents contents = new TiffReader(params != null && params.isStrict()).readDirectories(
byteSource, false, formatCompliance);
final TiffDirectory directory = contents.directories.get(0);
@@ -409,7 +409,7 @@ public class TiffImageParser extends ImageParser<TiffImagingParameters> implemen
public List<byte[]> collectRawImageData(final ByteSource byteSource, final TiffImagingParameters params)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance = FormatCompliance.getDefault();
- final TiffContents contents = new TiffReader(params != null ? params.isStrict() : false).readDirectories(
+ final TiffContents contents = new TiffReader(params != null && params.isStrict()).readDirectories(
byteSource, true, formatCompliance);
final List<byte[]> result = new ArrayList<>();