Add to result the raw, but parsed, bytes of byte segments in 2D barcodes

[zxing.git] / core / src / com / google / zxing / MonochromeBitmapSource.java

diff --git a/core/src/com/google/zxing/MonochromeBitmapSource.java b/core/src/com/google/zxing/MonochromeBitmapSource.java
index b828b94..64155a1 100644 (file)
--- a/core/src/com/google/zxing/MonochromeBitmapSource.java
+++ b/core/src/com/google/zxing/MonochromeBitmapSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 Google Inc.
+ * Copyright 2007 ZXing authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,8 @@ import com.google.zxing.common.BitArray;
  * <p>Encapsulates a generic black-and-white bitmap -- a collection of pixels in two dimensions.
  * This unifies many possible representations, like AWT's <code>BufferedImage</code>.</p>
  *
- * @author srowen@google.com (Sean Owen)
+ * @author Sean Owen
+ * @author dswitkin@google.com (Daniel Switkin)
  */
 public interface MonochromeBitmapSource {
 
@@ -48,6 +49,11 @@ public interface MonochromeBitmapSource {
    */
   BitArray getBlackRow(int y, BitArray row, int startX, int getWidth);
 
+  /**
+   * Entirely analogous to {@link #getBlackRow(int, BitArray, int, int)} but gets a column.
+   */
+  BitArray getBlackColumn(int x, BitArray column, int startY, int getHeight);
+
   /**
    * @return height of underlying image
    */
@@ -58,24 +64,6 @@ public interface MonochromeBitmapSource {
    */
   int getWidth();
 
-  /**
-   * Retrieves the luminance at the pixel x,y in the bitmap. This method is only used for estimating
-   * the black point and implementing getBlackRow() - it is not meant for decoding.
-   *
-   * @param x The x coordinate in the image.
-   * @param y The y coordinate in the image.
-   * @return The luminance value between 0 and 255.
-   */
-  int getLuminance(int x, int y);
-
-  /**
-   * Some implementations can be much more efficient by fetching an entire row of luminance data at
-   * a time. This method should be called once per row before calling getLuminance().
-   *
-   * @param y The row to cache.
-   */
-  void cacheRowForLuminance(int y);
-
   /**
    * <p>Estimates black point according to the given method, which is optionally parameterized by
    * a single int argument. For {@link BlackPointEstimationMethod#ROW_SAMPLING}, this