Issue 508

[zxing.git] / cpp / core / src / zxing / common / HybridBinarizer.h

diff --git a/cpp/core/src/zxing/common/HybridBinarizer.h b/cpp/core/src/zxing/common/HybridBinarizer.h
index 17aca8b..2d7653d 100644 (file)
--- a/cpp/core/src/zxing/common/HybridBinarizer.h
+++ b/cpp/core/src/zxing/common/HybridBinarizer.h
@@ -1,3 +1,5 @@
+#ifndef __HYBRIDBINARIZER_H__
+#define __HYBRIDBINARIZER_H__
 /*
  *  HybridBinarizer.h
  *  zxing
@@ -17,9 +19,6 @@
  * limitations under the License.
  */
 
-#ifndef HYBRIDBINARIZER_H_
-#define HYBRIDBINARIZER_H_
-
 #include <vector>
 #include <zxing/Binarizer.h>
 #include <zxing/common/GlobalHistogramBinarizer.h>
@@ -44,9 +43,9 @@ namespace zxing {
     void binarizeEntireImage();
     // We'll be using one-D arrays because C++ can't dynamically allocate 2D arrays
     int* calculateBlackPoints(unsigned char* luminances, int subWidth, int subHeight,
-      int stride);
+      int width, int height);
     void calculateThresholdForBlock(unsigned char* luminances, int subWidth, int subHeight,
-      int stride, int blackPoints[], Ref<BitMatrix> matrix);
+      int width, int height, int blackPoints[], Ref<BitMatrix> matrix);
     void threshold8x8Block(unsigned char* luminances, int xoffset, int yoffset, int threshold,
       int stride, Ref<BitMatrix> matrix);
        };