From 10b4dbbb516af20233f9fddb980d45bf7541f402 Mon Sep 17 00:00:00 2001 From: Eism Date: Wed, 17 Jul 2019 19:19:15 +0200 Subject: [PATCH] connect rss to the recognition module --- src/zxing/zxing/oned/MultiFormatOneDReader.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/zxing/zxing/oned/MultiFormatOneDReader.cpp b/src/zxing/zxing/oned/MultiFormatOneDReader.cpp index 7b18345..495fb7d 100644 --- a/src/zxing/zxing/oned/MultiFormatOneDReader.cpp +++ b/src/zxing/zxing/oned/MultiFormatOneDReader.cpp @@ -23,12 +23,16 @@ #include #include #include +#include +#include #include #include using zxing::Ref; using zxing::Result; using zxing::oned::MultiFormatOneDReader; +using zxing::oned::rss::RSS14Reader; +using zxing::oned::rss::RSSExpandedReader; // VC++ using zxing::DecodeHints; @@ -56,16 +60,16 @@ MultiFormatOneDReader::MultiFormatOneDReader(DecodeHints hints) : readers() { if (hints.containsFormat(BarcodeFormat::CODABAR)) { readers.push_back(Ref(new CodaBarReader())); } -/* + if (hints.containsFormat(BarcodeFormat::RSS_14)) { readers.push_back(Ref(new RSS14Reader())); } -*/ -/* + + if (hints.containsFormat(BarcodeFormat::RSS_EXPANDED)) { - readers.push_back(Ref(new RSS14ExpandedReader())); + readers.push_back(Ref(new RSSExpandedReader())); } -*/ + if (readers.size() == 0) { readers.push_back(Ref(new MultiFormatUPCEANReader(hints))); readers.push_back(Ref(new Code39Reader())); @@ -73,8 +77,8 @@ MultiFormatOneDReader::MultiFormatOneDReader(DecodeHints hints) : readers() { readers.push_back(Ref(new Code93Reader())); readers.push_back(Ref(new Code128Reader())); readers.push_back(Ref(new ITFReader())); - // readers.push_back(Ref(new RSS14Reader())); - // readers.push_back(Ref(new RSS14ExpandedReader())); + readers.push_back(Ref(new RSS14Reader())); + readers.push_back(Ref(new RSSExpandedReader())); } }