C++ port: add decode hints system

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

diff --git a/cpp/core/src/zxing/oned/UPCAReader.h b/cpp/core/src/zxing/oned/UPCAReader.h
index 217184b..d225d17 100644 (file)
--- a/cpp/core/src/zxing/oned/UPCAReader.h
+++ b/cpp/core/src/zxing/oned/UPCAReader.h
@@ -18,15 +18,15 @@
  * limitations under the License.
  */
 
-#include <zxing/oned/UPCEANReader.h>
-#include <zxing/Result.h>
+#include <zxing/oned/EAN13Reader.h>
+#include <zxing/DecodeHints.h>
 
 namespace zxing {
        namespace oned {
                class UPCAReader : public UPCEANReader {
                        
                private:
-                       UPCEANReader* ean13Reader;
+                       EAN13Reader ean13Reader;
                        static Ref<Result> maybeReturnResult(Ref<Result> result);                                                                                                               //throws ReaderException
                        
                public:
@@ -36,10 +36,9 @@ namespace zxing {
                        
                        Ref<Result> decodeRow(int rowNumber, Ref<BitArray> row);                                                                                                                //throws ReaderException
                        Ref<Result> decodeRow(int rowNumber, Ref<BitArray> row, int startGuardRange[]);                                                                 //throws ReaderException
-                       Ref<Result> decode(Ref<BinaryBitmap> image);
+                       Ref<Result> decode(Ref<BinaryBitmap> image, DecodeHints hints);
                        
                        BarcodeFormat getBarcodeFormat();
-                       ~UPCAReader();
                };
        }
-}
\ No newline at end of file
+}