X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=cpp%2Fcore%2Fsrc%2Fzxing%2FMultiFormatReader.h;h=53d6b57deb3073e3c99cd9d3603d924a851fa26e;hp=44d4ce24843b1f3d1a83af392985682ba7392467;hb=4c7d60a47387c3b95ce82e35a6c61ba3243f64f5;hpb=24d4480bc48cf9eabf7b2bd2f528248b0e458809

diff --git a/cpp/core/src/zxing/MultiFormatReader.h b/cpp/core/src/zxing/MultiFormatReader.h
index 44d4ce24..53d6b57d 100644
--- a/cpp/core/src/zxing/MultiFormatReader.h
+++ b/cpp/core/src/zxing/MultiFormatReader.h
@@ -1,9 +1,10 @@
+#ifndef __MULTI_FORMAT_READER_H__
+#define __MULTI_FORMAT_READER_H__
+
 /*
  *  MultiFormatBarcodeReader.h
  *  ZXing
  *
- *  Created by Lukasz Warchol on 10-01-26.
- *  Modified by Luiz Silva on 09/02/2010.
  *  Copyright 2010 ZXing authors All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,12 +30,20 @@ namespace zxing {
 	class MultiFormatReader : public Reader {
 		
 	private:
-		std::vector<Reader*>readers;
+	  Ref<Result> decodeInternal(Ref<BinaryBitmap> image);
+	
+		std::vector<Reader*> readers_;
+		DecodeHints hints_;
+
 	public:
 		MultiFormatReader();
 		
+		Ref<Result> decode(Ref<BinaryBitmap> image);
 		Ref<Result> decode(Ref<BinaryBitmap> image, DecodeHints hints);
-  
+    Ref<Result> decodeWithState(Ref<BinaryBitmap> image);
+    void setHints(DecodeHints hints);
 		~MultiFormatReader();
 	};
 }
+
+#endif