C++ port: Hints infrastructure was added in r1499. This changeset implements reader...

[zxing.git] / cpp / core / src / zxing / MultiFormatReader.cpp

diff --git a/cpp/core/src/zxing/MultiFormatReader.cpp b/cpp/core/src/zxing/MultiFormatReader.cpp
index a463188..66b4b13 100644 (file)
--- a/cpp/core/src/zxing/MultiFormatReader.cpp
+++ b/cpp/core/src/zxing/MultiFormatReader.cpp
@@ -28,16 +28,67 @@
 
 namespace zxing {
        MultiFormatReader::MultiFormatReader() {
-               readers.push_back(new zxing::qrcode::QRCodeReader());
-               readers.push_back(new zxing::datamatrix::DataMatrixReader());
-               readers.push_back(new zxing::oned::MultiFormatUPCEANReader());
-               readers.push_back(new zxing::oned::MultiFormatOneDReader());
+
        }
        
-       Ref<Result> MultiFormatReader::decode(Ref<BinaryBitmap> image, DecodeHints hints){
-               for (unsigned int i = 0; i < readers.size(); i++) {
+       Ref<Result> MultiFormatReader::decode(Ref<BinaryBitmap> image) {
+         setHints(DecodeHints::DEFAULT_HINT);
+         return decodeInternal(image);
+       }
+
+       Ref<Result> MultiFormatReader::decode(Ref<BinaryBitmap> image, DecodeHints hints) {
+    setHints(hints);
+    return decodeInternal(image);
+  }
+
+  Ref<Result> MultiFormatReader::decodeWithState(Ref<BinaryBitmap> image) {
+    // Make sure to set up the default state so we don't crash
+    if (readers_.size() == 0) {
+      setHints(DecodeHints::DEFAULT_HINT);
+    }
+    return decodeInternal(image);
+  }
+
+  void MultiFormatReader::setHints(DecodeHints hints) {
+    hints_ = hints;
+    readers_.clear();
+    bool tryHarder = hints.getTryHarder();
+
+    bool addOneDReader = hints.containsFormat(BarcodeFormat_UPC_E) ||
+                         hints.containsFormat(BarcodeFormat_UPC_A) ||
+                         hints.containsFormat(BarcodeFormat_EAN_8) ||
+                         hints.containsFormat(BarcodeFormat_EAN_13) ||
+                         hints.containsFormat(BarcodeFormat_CODE_128) ||
+                         hints.containsFormat(BarcodeFormat_CODE_39) ||
+                         hints.containsFormat(BarcodeFormat_ITF);
+    if (addOneDReader && !tryHarder) {
+      readers_.push_back(new zxing::oned::MultiFormatOneDReader(hints));
+    }
+    if (hints.containsFormat(BarcodeFormat_QR_CODE)) {
+      readers_.push_back(new zxing::qrcode::QRCodeReader());
+    }
+    if (hints.containsFormat(BarcodeFormat_DATA_MATRIX)) {
+      readers_.push_back(new zxing::datamatrix::DataMatrixReader());
+    }
+    //TODO: add PDF417 here once PDF417 reader is implemented
+    if (addOneDReader && tryHarder) {
+      readers_.push_back(new zxing::oned::MultiFormatOneDReader(hints));
+    }
+    if (readers_.size() == 0) {
+      if (!tryHarder) {
+        readers_.push_back(new zxing::oned::MultiFormatOneDReader(hints));
+      }
+      readers_.push_back(new zxing::qrcode::QRCodeReader());
+      if (tryHarder) {
+        readers_.push_back(new zxing::oned::MultiFormatOneDReader(hints));
+      }
+    }
+  }
+
+       Ref<Result> MultiFormatReader::decodeInternal(Ref<BinaryBitmap> image) {
+               for (unsigned int i = 0; i < readers_.size(); i++) {
                        try {
-                               return readers[i]->decode(image, hints);
+                               return readers_[i]->decode(image, hints_);
                        } catch (ReaderException re) {
                                // continue
                        }
@@ -46,8 +97,8 @@ namespace zxing {
        }
        
        MultiFormatReader::~MultiFormatReader(){
-               for (unsigned int i = 0; i < readers.size(); i++) {
-                       delete readers[i];
+               for (unsigned int i = 0; i < readers_.size(); i++) {
+                       delete readers_[i];
                }
        }
 }