Merge cc8cdf7 into ce72c9a

apache · Feb 5, 2022 · e2b23c8 · e2b23c8
2 parents ce72c9a + cc8cdf7
commit e2b23c8
Showing 1 changed file with 4 additions and 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
@@ -97,7 +97,7 @@ protected ImageFormat[] getAcceptedTypes() {
     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 byte[] getICCProfileBytes(final ByteSource byteSource, final TiffImagingP
     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 ImageMetadata getMetadata(final ByteSource byteSource, TiffImagingParamet
     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 FormatCompliance getFormatCompliance(final ByteSource byteSource)
     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<>();