biasTowardsWhite was, embarassingly, not accomplishing anything mathematically. It...

[zxing.git] / android / src / com / google / zxing / client / android / YUVMonochromeBitmapSource.java

diff --git a/android/src/com/google/zxing/client/android/YUVMonochromeBitmapSource.java b/android/src/com/google/zxing/client/android/YUVMonochromeBitmapSource.java
index e2614c1..ff03fcf 100755 (executable)
--- a/android/src/com/google/zxing/client/android/YUVMonochromeBitmapSource.java
+++ b/android/src/com/google/zxing/client/android/YUVMonochromeBitmapSource.java
@@ -19,6 +19,7 @@ package com.google.zxing.client.android;
 import android.graphics.Bitmap;
 import com.google.zxing.BlackPointEstimationMethod;
 import com.google.zxing.MonochromeBitmapSource;
+import com.google.zxing.ReaderException;
 import com.google.zxing.common.BitArray;
 import com.google.zxing.common.BlackPointEstimator;
 
@@ -30,7 +31,9 @@ import com.google.zxing.common.BlackPointEstimator;
  *
  * @author dswitkin@google.com (Daniel Switkin)
  * @author srowen@google.com (Sean Owen)
+ * @deprecated
  */
+@Deprecated
 final class YUVMonochromeBitmapSource implements MonochromeBitmapSource {
 
   private final Bitmap image;
@@ -77,12 +80,11 @@ final class YUVMonochromeBitmapSource implements MonochromeBitmapSource {
     return image.width();
   }
 
-  public void estimateBlackPoint(BlackPointEstimationMethod method, int argument) {
+  public void estimateBlackPoint(BlackPointEstimationMethod method, int argument) throws ReaderException {
     if (!method.equals(lastMethod) || argument != lastArgument) {
       int width = image.width();
       int height = image.height();
       int[] histogram = new int[LUMINANCE_BUCKETS];
-      float biasTowardsWhite = 1.0f;
       if (method.equals(BlackPointEstimationMethod.TWO_D_SAMPLING)) {
         int minDimension = width < height ? width : height;
         int startI = height == minDimension ? 0 : (height - width) >> 1;
@@ -95,7 +97,6 @@ final class YUVMonochromeBitmapSource implements MonochromeBitmapSource {
         if (argument < 0 || argument >= height) {
           throw new IllegalArgumentException("Row is not within the image: " + argument);
         }
-        biasTowardsWhite = 2.0f;
         int[] pixelRow = new int[width];
         image.getPixels(pixelRow, 0, width, 0, argument, width, 1);
         for (int x = 0; x < width; x++) {
@@ -104,7 +105,7 @@ final class YUVMonochromeBitmapSource implements MonochromeBitmapSource {
       } else {
         throw new IllegalArgumentException("Unknown method: " + method);
       }
-      blackPoint = BlackPointEstimator.estimate(histogram, biasTowardsWhite) << LUMINANCE_SHIFT;
+      blackPoint = BlackPointEstimator.estimate(histogram) << LUMINANCE_SHIFT;
       lastMethod = method;
       lastArgument = argument;
     }
@@ -114,4 +115,12 @@ final class YUVMonochromeBitmapSource implements MonochromeBitmapSource {
     return lastMethod;
   }
 
+  public MonochromeBitmapSource rotateCounterClockwise() {
+    throw new IllegalStateException("Rotate not supported");
+  }
+
+  public boolean isRotateSupported() {
+    return false;
+  }
+
 }
\ No newline at end of file