Converted tabs to spaces.

[zxing.git] / cpp / core / src / zxing / oned / MultiFormatUPCEANReader.h

diff --git a/cpp/core/src/zxing/oned/MultiFormatUPCEANReader.h b/cpp/core/src/zxing/oned/MultiFormatUPCEANReader.h
index 706f9c4..30e5c4d 100644 (file)
--- a/cpp/core/src/zxing/oned/MultiFormatUPCEANReader.h
+++ b/cpp/core/src/zxing/oned/MultiFormatUPCEANReader.h
@@ -1,8 +1,9 @@
+#ifndef __MULTI_FORMAT_UPC_EAN_READER_H__
+#define __MULTI_FORMAT_UPC_EAN_READER_H__
 /*
  *  MultiFormatUPCEANReader.h
  *  ZXing
  *
- *  Created by Lukasz Warchol on 10-01-25.
  *  Copyright 2010 ZXing authors All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,25 +18,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
- 
 
 #include <zxing/oned/OneDReader.h>
-#include <zxing/common/BitArray.h>
-#include <zxing/Result.h>
 
 namespace zxing {
-       namespace oned {
-               class MultiFormatUPCEANReader : public OneDReader {
-                       
-               private:
-                       std::vector<OneDReader*>* readers;
-               public:
-                       MultiFormatUPCEANReader();
-                       
-                       Ref<Result> decodeRow(int rowNumber, Ref<BitArray> row);
-                       
-                       ~MultiFormatUPCEANReader();
-               };
-       }
-}
\ No newline at end of file
+  namespace oned {
+    class MultiFormatUPCEANReader : public OneDReader {
+
+    private:
+      std::vector<Ref<OneDReader> > readers;
+    public:
+      MultiFormatUPCEANReader(DecodeHints hints);
+
+      Ref<Result> decodeRow(int rowNumber, Ref<BitArray> row);
+    };
+  }
+}
+
+#endif