dm1sh/QRCodeLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set byte as default encoding method for small amounts of data

Browse Source
This commit is contained in:
Dmitriy Shishkov 2021-12-20 16:57:31 +03:00
parent e011a5d7ed
commit 52f4bee621
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
QRCodeLibrary/QRCode.cpp
View File

@ -3,12 +3,17 @@
#include "QRCode.hpp" #include "QRCode.hpp"
#include "Encoder.hpp" #include "Encoder.hpp"
#include "DataBlocks.hpp" #include "DataBlocks.hpp"
#include "Tables.hpp"
QRCode::QRCode(string& input_, CorrectionLevel corr_lvl_, QRCodeMethod method_, char version_, unsigned char mask_n) : QRCode::QRCode(string& input_, CorrectionLevel corr_lvl_, QRCodeMethod method_, char version_, unsigned char mask_n) :
input{ input_ }, corr_lvl{ corr_lvl_ }, method{ method_ }, version{ version_ }, matrix(0) input{ input_ }, corr_lvl{ corr_lvl_ }, method{ method_ }, version{ version_ }, matrix(0)
{ {
if (method == QRCodeMethod::Dynamic) if (method == QRCodeMethod::Dynamic) {
method = Method::determite_method(input); if (input.size() > Tables::max_capability.at(corr_lvl).at(0) / 8)
method = Method::determite_method(input);
else
method = QRCodeMethod::Byte;
}
Encoder encoder(input, corr_lvl, method, version); Encoder encoder(input, corr_lvl, method, version);
const BitArray& encoded_data = encoder.encode(); const BitArray& encoded_data = encoder.encode();

5
tests/QRCode_test.cpp
View File

@ -11,12 +11,13 @@ public:
QRCodeConstructorMock(Parameters ...params) {}; QRCodeConstructorMock(Parameters ...params) {};
}; };
TEST(QRCodeTests, ConstructsClass) { TEST(QRCodeTests, ConstructsClass) {
string inp("TEST"); string inp("TESTTESTTESTTESTTESTTEST");
QRCode qr(inp); QRCode qr(inp);
EXPECT_EQ(qr.input, "TEST"); EXPECT_EQ(qr.input, "TESTTESTTESTTESTTESTTEST");
EXPECT_EQ(qr.corr_lvl, CorrectionLevel::M); EXPECT_EQ(qr.corr_lvl, CorrectionLevel::M);
EXPECT_EQ(qr.method, QRCodeMethod::Alphabetic); EXPECT_EQ(qr.method, QRCodeMethod::Alphabetic);
EXPECT_EQ(qr.version, 1);
} }
TEST(QRCodeTests, CreatesQRCode) { TEST(QRCodeTests, CreatesQRCode) {