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

Experimental implementation => in case of failure retry having rotated the image (1st @ 90 degrees, 2nd @ 180 degrees, 3rd @ 270 degrees). Increased success rate at QrCode tests.

This commit is contained in:
favoritas37 2016-06-15 04:13:37 +03:00
parent c7bbe4779a
commit 0ecf27cc37
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/qzxing.cpp
View File

@ -212,7 +212,25 @@ QString QZXing::decodeImage(const QImage &image, int maxWidth, int maxHeight, bo
if(!hasSucceded)
{
hints.setTryHarder(true);
res = decoder->decode(bb, hints);
try {
res = decoder->decode(bb, hints);
hasSucceded = true;
} catch(zxing::Exception &e) {}
if (bb->isRotateSupported()) {
Ref<BinaryBitmap> bbTmp = bb;
for (int i=0; (i<3 && !hasSucceded); i++) {
Ref<BinaryBitmap> rotatedImage(bbTmp->rotateCounterClockwise());
bbTmp = rotatedImage;
try {
res = decoder->decode(rotatedImage, hints);
hasSucceded = true;
} catch(zxing::Exception &e) {}
}
}
}
QString string = QString(res->getText()->getText().c_str());
@ -246,7 +264,13 @@ QString QZXing::decodeImageFromFile(const QString& imageFilePath, int maxWidth,
// used to have a check if this image exists
// but was removed because if the image file path doesn't point to a valid image
// then the QImage::isNull will return true and the decoding will fail eitherway.
QUrl imageUrl = QUrl::fromLocalFile(imageFilePath);
const QString header = "file://";
QString filePath = imageFilePath;
if(imageFilePath.startsWith(header))
filePath = imageFilePath.right(imageFilePath.size() - header.size());
QUrl imageUrl = QUrl::fromLocalFile(filePath);
QImage tmpImage = QImage(imageUrl.toLocalFile());
return decodeImage(tmpImage, maxWidth, maxHeight, smoothTransformation);
}