From 88a46d0773cbdc4b9008ffd43afc147c372b6bad Mon Sep 17 00:00:00 2001
From: "smparkes@smparkes.net"
 <smparkes@smparkes.net@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Sun, 8 Jul 2012 17:28:20 +0000
Subject: [PATCH] c++ version of r2344

git-svn-id: https://zxing.googlecode.com/svn/trunk@2346 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 cpp/core/src/zxing/Binarizer.cpp                         | 8 ++++++++
 cpp/core/src/zxing/Binarizer.h                           | 4 ++++
 cpp/core/src/zxing/qrcode/detector/Detector.cpp          | 6 +++++-
 cpp/core/src/zxing/qrcode/detector/Detector.h            | 9 ++++++---
 cpp/core/src/zxing/qrcode/detector/FinderPattern.h       | 3 ++-
 .../src/zxing/qrcode/detector/FinderPatternFinder.cpp    | 9 +++++++++
 cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.h | 5 +++++
 7 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/cpp/core/src/zxing/Binarizer.cpp b/cpp/core/src/zxing/Binarizer.cpp
index 86d891558..954b74073 100644
--- a/cpp/core/src/zxing/Binarizer.cpp
+++ b/cpp/core/src/zxing/Binarizer.cpp
@@ -33,5 +33,13 @@ namespace zxing {
 	Ref<LuminanceSource> Binarizer::getLuminanceSource() const {
 		return source_;
 	}
+
+  int Binarizer::getWidth() const {
+    return source_->getWidth();
+  }
+	
+  int Binarizer::getHeight() const {
+    return source_->getHeight();
+  }
 	
 }
diff --git a/cpp/core/src/zxing/Binarizer.h b/cpp/core/src/zxing/Binarizer.h
index 8ae258d7f..238c12ace 100644
--- a/cpp/core/src/zxing/Binarizer.h
+++ b/cpp/core/src/zxing/Binarizer.h
@@ -40,6 +40,10 @@ class Binarizer : public Counted {
 
   Ref<LuminanceSource> getLuminanceSource() const ;
   virtual Ref<Binarizer> createBinarizer(Ref<LuminanceSource> source) = 0;
+
+  int getWidth() const;
+  int getHeight() const;
+
 };
 
 }
diff --git a/cpp/core/src/zxing/qrcode/detector/Detector.cpp b/cpp/core/src/zxing/qrcode/detector/Detector.cpp
index 53c9403c7..e872c3a05 100644
--- a/cpp/core/src/zxing/qrcode/detector/Detector.cpp
+++ b/cpp/core/src/zxing/qrcode/detector/Detector.cpp
@@ -42,10 +42,14 @@ Detector::Detector(Ref<BitMatrix> image) :
     image_(image) {
 }
 
-Ref<BitMatrix> Detector::getImage() {
+Ref<BitMatrix> Detector::getImage() const {
    return image_;
 }
 
+Ref<ResultPointCallback> Detector::getResultPointCallback() const {
+   return callback_;
+}
+
 Ref<DetectorResult> Detector::detect(DecodeHints const& hints) {
   callback_ = hints.getResultPointCallback();
   FinderPatternFinder finder(image_, hints.getResultPointCallback());
diff --git a/cpp/core/src/zxing/qrcode/detector/Detector.h b/cpp/core/src/zxing/qrcode/detector/Detector.h
index 62e5c8642..383d5c250 100644
--- a/cpp/core/src/zxing/qrcode/detector/Detector.h
+++ b/cpp/core/src/zxing/qrcode/detector/Detector.h
@@ -1,3 +1,4 @@
+// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
 #ifndef __DETECTOR_H__
 #define __DETECTOR_H__
 
@@ -40,7 +41,8 @@ private:
   Ref<ResultPointCallback> callback_;
 
 protected:
-  Ref<BitMatrix> getImage();
+  Ref<BitMatrix> getImage() const;
+  Ref<ResultPointCallback> getResultPointCallback() const;
 
   static Ref<BitMatrix> sampleGrid(Ref<BitMatrix> image, int dimension, Ref<PerspectiveTransform>);
   static int computeDimension(Ref<ResultPoint> topLeft, Ref<ResultPoint> topRight, Ref<ResultPoint> bottomLeft,
@@ -53,14 +55,15 @@ protected:
       float allowanceFactor);
   Ref<DetectorResult> processFinderPatternInfo(Ref<FinderPatternInfo> info);
 public:
-
   virtual Ref<PerspectiveTransform> createTransform(Ref<ResultPoint> topLeft, Ref<ResultPoint> topRight, Ref <
       ResultPoint > bottomLeft, Ref<ResultPoint> alignmentPattern, int dimension);
 
   Detector(Ref<BitMatrix> image);
   Ref<DetectorResult> detect(DecodeHints const& hints);
+
+
 };
 }
 }
 
-#endif // __DETECTOR_H__
\ No newline at end of file
+#endif // __DETECTOR_H__
diff --git a/cpp/core/src/zxing/qrcode/detector/FinderPattern.h b/cpp/core/src/zxing/qrcode/detector/FinderPattern.h
index e23ba5dc0..87b61c8ae 100644
--- a/cpp/core/src/zxing/qrcode/detector/FinderPattern.h
+++ b/cpp/core/src/zxing/qrcode/detector/FinderPattern.h
@@ -32,9 +32,10 @@ namespace zxing {
 			float estimatedModuleSize_;
 			int count_;
 			
+			FinderPattern(float posX, float posY, float estimatedModuleSize, int count);
+
 		public:
 			FinderPattern(float posX, float posY, float estimatedModuleSize);
-			FinderPattern(float posX, float posY, float estimatedModuleSize, int count);
 			int getCount() const;
 			float getEstimatedModuleSize() const;
 			void incrementCount();
diff --git a/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.cpp b/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.cpp
index 35ce976b5..a363df4d7 100644
--- a/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.cpp
+++ b/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.cpp
@@ -537,5 +537,14 @@ Ref<FinderPatternInfo> FinderPatternFinder::find(DecodeHints const& hints) {
   Ref<FinderPatternInfo> result(new FinderPatternInfo(patternInfo));
   return result;
 }
+
+Ref<BitMatrix> FinderPatternFinder::getImage() {
+  return image_;
+}
+
+std::vector<Ref<FinderPattern> >& FinderPatternFinder::getPossibleCenters() {
+  return possibleCenters_;
+}
+
 }
 }
diff --git a/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.h b/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.h
index 1d85f9b65..82d43652f 100644
--- a/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.h
+++ b/cpp/core/src/zxing/qrcode/detector/FinderPatternFinder.h
@@ -1,3 +1,4 @@
+// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
 #ifndef __FINDER_PATTERN_FINDER_H__
 #define __FINDER_PATTERN_FINDER_H__
 
@@ -60,6 +61,10 @@ protected:
   bool haveMultiplyConfirmedCenters();
   std::vector<Ref<FinderPattern> > selectBestPatterns();
   static std::vector<Ref<FinderPattern> > orderBestPatterns(std::vector<Ref<FinderPattern> > patterns);
+
+  Ref<BitMatrix> getImage();
+  std::vector<Ref<FinderPattern> >& getPossibleCenters();
+
 public:
   static float distance(Ref<ResultPoint> p1, Ref<ResultPoint> p2);
   FinderPatternFinder(Ref<BitMatrix> image, Ref<ResultPointCallback>const&);