Changed the order of the BaseMonochromeBitmapSource constructor arguments to be width...

[zxing.git] / androidtest / src / com / google / zxing / client / androidtest / RGBMonochromeBitmapSource.java

diff --git a/androidtest/src/com/google/zxing/client/androidtest/RGBMonochromeBitmapSource.java b/androidtest/src/com/google/zxing/client/androidtest/RGBMonochromeBitmapSource.java
index 23bde73..8f1c249 100644 (file)
--- a/androidtest/src/com/google/zxing/client/androidtest/RGBMonochromeBitmapSource.java
+++ b/androidtest/src/com/google/zxing/client/androidtest/RGBMonochromeBitmapSource.java
@@ -24,16 +24,22 @@ import java.io.FileNotFoundException;
 
 public final class RGBMonochromeBitmapSource extends BaseMonochromeBitmapSource {
 
-  private int mWidth;
-  private int mHeight;
-  private byte[] mLuminances;
+  private final byte[] mLuminances;
 
   public RGBMonochromeBitmapSource(String path) throws FileNotFoundException {
+    this(loadBitmap(path));
+  }
+
+  private static Bitmap loadBitmap(String path) throws FileNotFoundException {
     Bitmap bitmap = BitmapFactory.decodeFile(path);
     if (bitmap == null) {
       throw new FileNotFoundException("Couldn't open " + path);
     }
+    return bitmap;
+  }
 
+  public RGBMonochromeBitmapSource(Bitmap bitmap) {
+    super(bitmap.getWidth(), bitmap.getHeight());
     int width = bitmap.getWidth();
     int height = bitmap.getHeight();
     int[] pixels = new int[width * height];
@@ -42,8 +48,6 @@ public final class RGBMonochromeBitmapSource extends BaseMonochromeBitmapSource
     // In order to measure pure decoding speed, we convert the entire image to a greyscale array up
     // front, which is the same as the Y channel of the YUVMonochromeBitmapSource in the real app.
     mLuminances = new byte[width * height];
-    mWidth = width;
-    mHeight = height;
     for (int y = 0; y < height; y++) {
       int offset = y * height;
       for (int x = 0; x < width; x++) {
@@ -62,20 +66,14 @@ public final class RGBMonochromeBitmapSource extends BaseMonochromeBitmapSource
     }
   }
 
-  public final int getHeight() {
-    return mHeight;
-  }
-
-  public final int getWidth() {
-    return mWidth;
-  }
-
-  protected final int getLuminance(int x, int y) {
-    return mLuminances[y * mWidth + x] & 0xff;
+  @Override
+  protected int getLuminance(int x, int y) {
+    return mLuminances[y * getWidth() + x] & 0xff;
   }
 
-  protected final int[] getLuminanceRow(int y, int[] row) {
-    int width = mWidth;
+  @Override
+  protected int[] getLuminanceRow(int y, int[] row) {
+    int width = getWidth();
     if (row == null || row.length < width) {
       row = new int[width];
     }
@@ -86,9 +84,10 @@ public final class RGBMonochromeBitmapSource extends BaseMonochromeBitmapSource
     return row;
   }
 
-  protected final int[] getLuminanceColumn(int x, int[] column) {
-    int width = mWidth;
-    int height = mHeight;
+  @Override
+  protected int[] getLuminanceColumn(int x, int[] column) {
+    int width = getWidth();
+    int height = getHeight();
     if (column == null || column.length < height) {
       column = new int[height];
     }