Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@commons.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1763723 -
 /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
Date: Fri, 07 Oct 2016 10:15:38 -0000
To: commits@commons.apache.org
From: sebb@apache.org
Message-Id: <20161007101539.35BD33A039C@svn01-us-west.apache.org>
archived-at: Fri, 07 Oct 2016 10:15:44 -0000

Author: sebb
Date: Fri Oct  7 10:15:38 2016
New Revision: 1763723

URL: http://svn.apache.org/viewvc?rev=1763723&view=rev
Log:
no point having protected objects in a package-protected class

Modified:
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java?rev=1763723&r1=1763722&r2=1763723&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java Fri Oct  7 10:15:38 2016
@@ -33,17 +33,17 @@ import org.apache.commons.imaging.format
 import static org.apache.commons.imaging.common.BinaryFunctions.*;
 
 abstract class ScanExpediter {
-    protected final int width;
-    protected final int height;
-    protected final InputStream is;
-    protected final BufferedImage bi;
-    protected final PngColorType pngColorType;
-    protected final int bitDepth;
-    protected final int bytesPerPixel;
-    protected final int bitsPerPixel;
-    protected final PngChunkPlte pngChunkPLTE;
-    protected final GammaCorrection gammaCorrection;
-    protected final TransparencyFilter transparencyFilter;
+    final int width;
+    final int height;
+    final InputStream is;
+    final BufferedImage bi;
+    final PngColorType pngColorType;
+    final int bitDepth;
+    final int bytesPerPixel;
+    final int bitsPerPixel;
+    final PngChunkPlte pngChunkPLTE;
+    final GammaCorrection gammaCorrection;
+    final TransparencyFilter transparencyFilter;
 
     public ScanExpediter(final int width, final int height, final InputStream is,
             final BufferedImage bi, final PngColorType pngColorType, final int bitDepth, final int bitsPerPixel,
@@ -64,24 +64,24 @@ abstract class ScanExpediter {
         this.transparencyFilter = transparencyFilter;
     }
 
-    protected final int getBitsToBytesRoundingUp(final int bits) {
+    final int getBitsToBytesRoundingUp(final int bits) {
         return (bits + 7) / 8;
     }
 
-    protected final int getPixelARGB(final int alpha, final int red, final int green, final int blue) {
+    final int getPixelARGB(final int alpha, final int red, final int green, final int blue) {
         return ((0xff & alpha) << 24)
              | ((0xff & red)   << 16)
              | ((0xff & green) << 8)
              | ((0xff & blue)  << 0);
     }
 
-    protected final int getPixelRGB(final int red, final int green, final int blue) {
+    final int getPixelRGB(final int red, final int green, final int blue) {
         return getPixelARGB(0xff, red, green, blue);
     }
 
     public abstract void drive() throws ImageReadException, IOException;
 
-    protected int getRGB(final BitParser bitParser, final int pixelIndexInScanline) 
+    int getRGB(final BitParser bitParser, final int pixelIndexInScanline) 
             throws ImageReadException, IOException {
 
         switch (pngColorType) {
@@ -171,7 +171,7 @@ abstract class ScanExpediter {
         }
     }
 
-    protected ScanlineFilter getScanlineFilter(FilterType filterType, int bytesPerPixel) throws ImageReadException {
+    ScanlineFilter getScanlineFilter(FilterType filterType, int bytesPerPixel) throws ImageReadException {
         switch (filterType) {
             case NONE:
                 return new ScanlineFilterNone();
@@ -188,7 +188,7 @@ abstract class ScanExpediter {
         return null;
     }
 
-    protected byte[] unfilterScanline(final FilterType filterType, final byte[] src, final byte[] prev,
+    byte[] unfilterScanline(final FilterType filterType, final byte[] src, final byte[] prev,
             final int bytesPerPixel) throws ImageReadException, IOException {
         final ScanlineFilter filter = getScanlineFilter(filterType, bytesPerPixel);
 
@@ -197,7 +197,7 @@ abstract class ScanExpediter {
         return dst;
     }
 
-    protected byte[] getNextScanline(final InputStream is, final int length, final byte[] prev,
+    byte[] getNextScanline(final InputStream is, final int length, final byte[] prev,
             final int bytesPerPixel) throws ImageReadException, IOException {
         final int filterType = is.read();
         if (filterType < 0) {