Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/zxing/MultiFormatReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <zxing/oned/MultiFormatUPCEANReader.h>
#include <zxing/oned/MultiFormatOneDReader.h>
#include <zxing/ReaderException.h>
#include <zxing/NotFoundException.h>

using zxing::Ref;
using zxing::Result;
Expand Down Expand Up @@ -118,7 +119,7 @@ Ref<Result> MultiFormatReader::decodeInternal(Ref<BinaryBitmap> image) {
// continue
}
}
throw ReaderException("No code detected");
throw NotFoundException("No code detected");
}

MultiFormatReader::~MultiFormatReader() {}
4 changes: 2 additions & 2 deletions core/src/zxing/multi/GenericMultipleBarcodeReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

#include <zxing/multi/GenericMultipleBarcodeReader.h>
#include <zxing/ReaderException.h>
#include <zxing/NotFoundException.h>
#include <zxing/ResultPoint.h>

using std::vector;
Expand All @@ -39,7 +39,7 @@ vector<Ref<Result> > GenericMultipleBarcodeReader::decodeMultiple(Ref<BinaryBitm
vector<Ref<Result> > results;
doDecodeMultiple(image, hints, results, 0, 0, 0);
if (results.empty()){
throw ReaderException("No code detected");
throw NotFoundException("No code detected");
}
return results;
}
Expand Down
3 changes: 2 additions & 1 deletion core/src/zxing/multi/qrcode/QRCodeMultiReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <zxing/multi/qrcode/QRCodeMultiReader.h>
#include <zxing/ReaderException.h>
#include <zxing/NotFoundException.h>
#include <zxing/multi/qrcode/detector/MultiDetector.h>
#include <zxing/BarcodeFormat.h>

Expand Down Expand Up @@ -49,7 +50,7 @@ std::vector<Ref<Result> > QRCodeMultiReader::decodeMultiple(Ref<BinaryBitmap> im
}
}
if (results.empty()){
throw ReaderException("No code detected");
throw NotFoundException("No code detected");
}
return results;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
#include <algorithm>
#include <zxing/multi/qrcode/detector/MultiFinderPatternFinder.h>
#include <zxing/DecodeHints.h>
#include <zxing/ReaderException.h>
#include <zxing/NotFoundException.h>

using std::abs;
using std::min;
using std::sort;
using std::vector;
using zxing::Ref;
using zxing::BitMatrix;
using zxing::ReaderException;
using zxing::NotFoundException;
using zxing::qrcode::FinderPattern;
using zxing::qrcode::FinderPatternInfo;
using zxing::multi::MultiFinderPatternFinder;
Expand Down Expand Up @@ -142,7 +142,7 @@ vector<vector<Ref<FinderPattern> > > MultiFinderPatternFinder::selectBestPattern

if (size < 3) {
// Couldn't find enough finder patterns
throw ReaderException("No code detected");
throw NotFoundException("No code detected");
}

vector<vector<Ref<FinderPattern> > > results;
Expand Down Expand Up @@ -230,7 +230,7 @@ vector<vector<Ref<FinderPattern> > > MultiFinderPatternFinder::selectBestPattern
} // end iterate p1
if (results.empty()){
// Nothing found!
throw ReaderException("No code detected");
throw NotFoundException("No code detected");
}
return results;
}