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/06/28 17:12:16 UTC

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

Author: tilman
Date: Mon Jun 28 17:12:16 2021
New Revision: 1891113

URL: http://svn.apache.org/viewvc?rev=1891113&view=rev
Log:
PDFBOX-5229: Sonar fix

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

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java?rev=1891113&r1=1891112&r2=1891113&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java Mon Jun 28 17:12:16 2021
@@ -445,7 +445,8 @@ public final class PDImageXObject extend
 
         // get RGB image w/o reference because applyMask might modify it, take long time and a lot of memory. 
         final BufferedImage image;
-        final PDImageXObject softMask = getSoftMask(), mask = getMask();
+        final PDImageXObject softMask = getSoftMask();
+        final PDImageXObject mask = getMask();
         // soft mask (overrides explicit mask)
         if (softMask != null)
         {
@@ -638,7 +639,8 @@ public final class PDImageXObject extend
             {
                 raster.getPixels(0, y, width, 1, pixels);
                 alpha.getSamples(0, y, width, 1, 0, alphas);
-                for (int x = 0, offset = 0; x < width; x++)
+                int offset = 0;
+                for (int x = 0; x < width; x++)
                 {
                     int a = alphas[x];
                     if (a == 0)
@@ -670,7 +672,8 @@ public final class PDImageXObject extend
      */
     private static BufferedImage scaleImage(BufferedImage image, int width, int height, int type, boolean interpolate)
     {
-        final int imgWidth = image.getWidth(), imgHeight = image.getHeight();
+        final int imgWidth = image.getWidth();
+        final int imgHeight = image.getHeight();
         // largeScale switch is arbitrarily chosen as to where bicubic becomes very slow
         boolean largeScale = width * height > 3000 * 3000 * (type == BufferedImage.TYPE_BYTE_GRAY ? 3 : 1);
         interpolate &= imgWidth != width || imgHeight != height;