status-im
/
qzxing
mirror of https://github.com/status-im/qzxing.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation of project when targeting MSVC. #113

This commit is contained in:
Nikos Ftylitakis 2019-06-26 11:11:46 +03:00
parent 2fd0557cf0
commit f846faa2d7
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/zxing/zxing/DecodeHints.cpp
View File

@ -21,6 +21,7 @@
#include <zxing/DecodeHints.h>
#include <zxing/common/IllegalArgumentException.h>
#include <qglobal.h>
#include <iterator>
using zxing::Ref;
using zxing::ResultPointCallback;

4
src/zxing/zxing/oned/UPCEANReader.cpp
View File

@ -118,14 +118,14 @@ UPCEANReader::L_AND_G_PATTERNS (VECTOR_INIT(L_AND_G_PATTERNS_));
UPCEANReader::UPCEANReader() {}
Ref<Result> UPCEANReader::decodeRow(int rowNumber, Ref<BitArray> row, DecodeHints hints) {
Ref<Result> UPCEANReader::decodeRow(int rowNumber, Ref<BitArray> row, zxing::DecodeHints hints) {
return decodeRow(rowNumber, row, findStartGuardPattern(row), hints);
}
Ref<Result> UPCEANReader::decodeRow(int rowNumber,
Ref<BitArray> row,
Range const& startGuardRange,
DecodeHints hints) {
zxing::DecodeHints hints) {
string& result = decodeRowStringBuffer;
result.clear();
int endStart = decodeMiddle(row, startGuardRange, result);

4
src/zxing/zxing/oned/UPCEANReader.h
View File

@ -68,8 +68,8 @@ public:
Range const& startRange,
std::string& resultString) = 0;
virtual Ref<Result> decodeRow(int rowNumber, Ref<BitArray> row, DecodeHints hints);
virtual Ref<Result> decodeRow(int rowNumber, Ref<BitArray> row, Range const& range, DecodeHints hints = DecodeHints());
virtual Ref<Result> decodeRow(int rowNumber, Ref<BitArray> row, zxing::DecodeHints hints);
virtual Ref<Result> decodeRow(int rowNumber, Ref<BitArray> row, Range const& range, zxing::DecodeHints hints = DecodeHints());
static int decodeDigit(Ref<BitArray> row,
std::vector<int>& counters,