svn commit: r1873679 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java

[ti...@apache.org]

Author: tilman
Date: Thu Feb  6 03:48:23 2020
New Revision: 1873679

URL: http://svn.apache.org/viewvc?rev=1873679&view=rev
Log:
PDFBOX-4767: remove unneeded null check; move comment to correct place; simplify code

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java?rev=1873679&r1=1873678&r2=1873679&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java Thu Feb  6 03:48:23 2020
@@ -74,7 +74,7 @@ public final class PDInlineImage impleme
 
         DecodeResult decodeResult = null;
         List<String> filters = getFilters();
-        if (filters == null || filters.isEmpty())
+        if (filters.isEmpty())
         {
             this.decodedData = data;
         }
@@ -311,20 +311,18 @@ public final class PDInlineImage impleme
         List<String> filters = getFilters();
         ByteArrayInputStream in = new ByteArrayInputStream(rawData);
         ByteArrayOutputStream out = new ByteArrayOutputStream(rawData.length);
-        for (int i = 0; filters != null && i < filters.size(); i++)
+        for (int i = 0; i < filters.size(); i++)
         {
-            // TODO handling of abbreviated names belongs here, rather than in other classes
-            out.reset();
             if (stopFilters.contains(filters.get(i)))
             {
                 break;
             }
-            else
-            {
-                Filter filter = FilterFactory.INSTANCE.getFilter(filters.get(i));
-                filter.decode(in, out, parameters, i);
-                in = new ByteArrayInputStream(out.toByteArray());
-            }
+
+            // TODO handling of abbreviated names belongs here, rather than in other classes
+            Filter filter = FilterFactory.INSTANCE.getFilter(filters.get(i));
+            out.reset();
+            filter.decode(in, out, parameters, i);
+            in = new ByteArrayInputStream(out.toByteArray());
         }
         return in;
     }