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/01/16 02:03:09 UTC
[commons-imaging] 09/24: [IMAGING-159] Fix CI build errors
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
commit 98b3919710879808ee749235ffad15b08ee28280
Author: Bruno P. Kinoshita <ki...@apache.org>
AuthorDate: Sat May 15 22:29:49 2021 +1200
[IMAGING-159] Fix CI build errors
---
src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java | 2 +-
.../java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java b/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
index b2f3daa..6325d45 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
@@ -414,7 +414,7 @@ class PngWriter {
}
final Object pixelDensityObj = params.getPixelDensity();
- if (pixelDensityObj instanceof PixelDensity) {
+ if (pixelDensityObj != null) {
final PixelDensity pixelDensity = (PixelDensity) pixelDensityObj;
if (pixelDensity.isUnitless()) {
writeChunkPHYS(os, (int) Math.round(pixelDensity.getRawHorizontalDensity()),
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 4e2d0f2..3faf96e 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
@@ -349,7 +349,7 @@ public class TiffImageParser extends ImageParser<TiffImagingParameters> implemen
// try
{
final FormatCompliance formatCompliance = FormatCompliance.getDefault();
- final TiffImagingParameters params = null;
+ final TiffImagingParameters params = new TiffImagingParameters();
final TiffContents contents = new TiffReader(true).readContents(
byteSource, params, formatCompliance);
@@ -390,7 +390,7 @@ public class TiffImageParser extends ImageParser<TiffImagingParameters> implemen
public FormatCompliance getFormatCompliance(final ByteSource byteSource)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance = FormatCompliance.getDefault();
- final TiffImagingParameters params = null;
+ final TiffImagingParameters params = new TiffImagingParameters();
new TiffReader(isStrict(params)).readContents(byteSource, params,
formatCompliance);
return formatCompliance;