You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2021/03/24 07:35:56 UTC
svn commit: r1887991 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java
Author: tilman
Date: Wed Mar 24 07:35:56 2021
New Revision: 1887991
URL: http://svn.apache.org/viewvc?rev=1887991&view=rev
Log:
PDFBOX-4892: avoid possible later UnsupportedOperationException in readRaster() due to non null loop ending without raster capability
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java?rev=1887991&r1=1887990&r2=1887991&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java Wed Mar 24 07:35:56 2021
@@ -149,20 +149,16 @@ public abstract class Filter
protected static ImageReader findImageReader(String formatName, String errorCause) throws MissingImageReaderException
{
Iterator<ImageReader> readers = ImageIO.getImageReadersByFormatName(formatName);
- ImageReader reader = null;
+ ImageReader reader;
while (readers.hasNext())
{
reader = readers.next();
if (reader != null && reader.canReadRaster())
{
- break;
+ return reader;
}
}
- if (reader == null)
- {
- throw new MissingImageReaderException("Cannot read " + formatName + " image: " + errorCause);
- }
- return reader;
+ throw new MissingImageReaderException("Cannot read " + formatName + " image: " + errorCause);
}
/**