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

Merge branch 'master' of https://github.com/ftylitak/qzxing

This commit is contained in:
nikos.ftylitakis 2018-02-08 12:34:54 +02:00
parent 4c9d50eaad 8d5d474303
commit b9823b7d7f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/QZXing.cpp
View File

@ -381,7 +381,7 @@ QString QZXing::decodeImage(const QImage &image, int maxWidth, int maxHeight, bo
QString string = QString(res->getText()->getText().c_str()); QString string = QString(res->getText()->getText().c_str());
if (!string.isEmpty() && (string.length() > 0)) { if (!string.isEmpty() && (string.length() > 0)) {
int fmt = res->getBarcodeFormat().value; int fmt = res->getBarcodeFormat().value;
foundedFmt = decoderFormatToString(fmt); foundedFmt = decoderFormatToString(1<<fmt);
charSet_ = QString::fromStdString(res->getCharSet()); charSet_ = QString::fromStdString(res->getCharSet());
if (!charSet_.isEmpty()) { if (!charSet_.isEmpty()) {
QTextCodec *codec = QTextCodec::codecForName(res->getCharSet().c_str()); QTextCodec *codec = QTextCodec::codecForName(res->getCharSet().c_str());