diff --git a/3rdparty/zxing-cpp b/3rdparty/zxing-cpp index baecef0..670e78e 160000 --- a/3rdparty/zxing-cpp +++ b/3rdparty/zxing-cpp @@ -1 +1 @@ -Subproject commit baecef0d69b81ace79cd44035ac859bc201f1847 +Subproject commit 670e78e89549ef001710b2a98b9011f9b7b58d12 diff --git a/src/QrCodeDecoder.cpp b/src/QrCodeDecoder.cpp index 2c2c10f..b0da17f 100644 --- a/src/QrCodeDecoder.cpp +++ b/src/QrCodeDecoder.cpp @@ -1,91 +1,91 @@ /* * Kaidan - A user-friendly XMPP client for every device! * * Copyright (C) 2016-2019 Kaidan developers and contributors * (see the LICENSE file for a full list of copyright authors) * * Kaidan is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * In addition, as a special exception, the author of Kaidan gives * permission to link the code of its release with the OpenSSL * project's "OpenSSL" library (or with modified versions of it that * use the same license as the "OpenSSL" library), and distribute the * linked executables. You must obey the GNU General Public License in * all respects for all of the code used other than "OpenSSL". If you * modify this file, you may extend this exception to your version of * the file, but you are not obligated to do so. If you do not wish to * do so, delete this exception statement from your version. * * Kaidan is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with Kaidan. If not, see . */ #include "QrCodeDecoder.h" // Qt #include #include // ZXing-cpp #include #include #include #include #include #include #include #include using namespace ZXing; QrCodeDecoder::QrCodeDecoder(QObject *parent) : QObject(parent) { } void QrCodeDecoder::decodeImage(const QImage &image) { // options for decoding DecodeHints decodeHints; // Advise the decoder to also decode rotated QR codes. - decodeHints.setShouldTryRotate(true); + decodeHints.setTryRotate(true); // Advise the decoder to only decode QR codes. std::vector allowedFormats; allowedFormats.emplace_back(BarcodeFormat::QR_CODE); decodeHints.setPossibleFormats(allowedFormats); MultiFormatReader reader(decodeHints); // Create an image source to be decoded later. GenericLuminanceSource source( image.width(), image.height(), image.bits(), image.width(), 1, 0, 1, 2 ); // Create an image source specific for decoding black data on white background. HybridBinarizer binImage(std::shared_ptr(&source, [](void*) {})); // Decode the specific image source. auto result = reader.read(binImage); // If a QR code could be found and decoded, emit a signal with the decoded string. // Otherwise, emit a signal for failed decoding. if (result.isValid()) emit decodingSucceeded(QString::fromStdString(TextUtfEncoding::ToUtf8(result.text()))); else emit decodingFailed(); }