Issue 505

[zxing.git] / cpp / core / src / zxing / qrcode / detector / FinderPatternFinder.h

diff --git a/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.h b/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.h
index e1fc9ce..6c8684d 100644 (file)
--- a/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.h
+++ b/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.h
@@ -5,8 +5,7 @@
  *  FinderPatternFinder.h
  *  zxing
  *
- *  Created by Christian Brunschen on 13/05/2008.
- *  Copyright 2008 ZXing authors All rights reserved.
+ *  Copyright 2010 ZXing authors All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +24,13 @@
 #include <zxing/qrcode/detector/FinderPatternInfo.h>
 #include <zxing/common/Counted.h>
 #include <zxing/common/BitMatrix.h>
+#include <zxing/ResultPointCallback.h>
 #include <vector>
 
 namespace zxing {
+
+class DecodeHints;
+
 namespace qrcode {
 
 class FinderPatternFinder {
@@ -40,6 +43,8 @@ private:
   std::vector<Ref<FinderPattern> > possibleCenters_;
   bool hasSkipped_;
 
+  Ref<ResultPointCallback> callback_;
+
   /** stateCount must be int[5] */
   static float centerFromEnd(int* stateCount, int end);
   static bool foundPatternCross(int* stateCount);
@@ -53,11 +58,10 @@ private:
   bool haveMultiplyConfirmedCenters();
   std::vector<Ref<FinderPattern> > selectBestPatterns();
   static std::vector<Ref<FinderPattern> > orderBestPatterns(std::vector<Ref<FinderPattern> > patterns);
-
 public:
   static float distance(Ref<ResultPoint> p1, Ref<ResultPoint> p2);
-  FinderPatternFinder(Ref<BitMatrix> image);
-  Ref<FinderPatternInfo> find();
+  FinderPatternFinder(Ref<BitMatrix> image, Ref<ResultPointCallback>const&);
+  Ref<FinderPatternInfo> find(DecodeHints const& hints);
 };
 }
 }