status-im/QR-Code-generator
2
0
Fork 0
mirror of https://github.com/status-im/QR-Code-generator.git synced 2025-02-24 10:28:20 +00:00
Code Issues Projects Releases Wiki Activity

Tweaked C++ code to inline handleConstructorMasking() because the mask field is private instead of public const.

Browse Source
This commit is contained in:
Project Nayuki 2018-11-04 19:16:28 +00:00
parent 76de28378e
commit 2359d68243
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
cpp/QrCode.cpp
View File

@ -139,11 +139,31 @@ QrCode::QrCode(int ver, Ecc ecl, const vector<uint8_t> &dataCodewords, int mask)
modules = vector<vector<bool> >(size, vector<bool>(size)); // Initially all white modules = vector<vector<bool> >(size, vector<bool>(size)); // Initially all white
isFunction = vector<vector<bool> >(size, vector<bool>(size)); isFunction = vector<vector<bool> >(size, vector<bool>(size));
// Compute ECC, draw modules, do masking // Compute ECC, draw modules
drawFunctionPatterns(); drawFunctionPatterns();
const vector<uint8_t> allCodewords = addEccAndInterleave(dataCodewords); const vector<uint8_t> allCodewords = addEccAndInterleave(dataCodewords);
drawCodewords(allCodewords); drawCodewords(allCodewords);
this->mask = handleConstructorMasking(mask);
// Do masking
if (mask == -1) { // Automatically choose best mask
long minPenalty = LONG_MAX;
for (int i = 0; i < 8; i++) {
drawFormatBits(i);
applyMask(i);
long penalty = getPenaltyScore();
if (penalty < minPenalty) {
mask = i;
minPenalty = penalty;
}
applyMask(i); // Undoes the mask due to XOR
}
}
if (mask < 0 || mask > 7)
throw std::logic_error("Assertion error");
this->mask = mask;
drawFormatBits(mask); // Overwrite old format bits
applyMask(mask); // Apply the final choice of mask
isFunction.clear(); isFunction.clear();
isFunction.shrink_to_fit(); isFunction.shrink_to_fit();
} }
@ -403,28 +423,6 @@ void QrCode::applyMask(int mask) {
} }
int QrCode::handleConstructorMasking(int mask) {
if (mask == -1) { // Automatically choose best mask
long minPenalty = LONG_MAX;
for (int i = 0; i < 8; i++) {
drawFormatBits(i);
applyMask(i);
long penalty = getPenaltyScore();
if (penalty < minPenalty) {
mask = i;
minPenalty = penalty;
}
applyMask(i); // Undoes the mask due to XOR
}
}
if (mask < 0 || mask > 7)
throw std::logic_error("Assertion error");
drawFormatBits(mask); // Overwrite old format bits
applyMask(mask); // Apply the final choice of mask
return mask; // The caller shall assign this value to the final-declared field
}
long QrCode::getPenaltyScore() const { long QrCode::getPenaltyScore() const {
long result = 0; long result = 0;

6
cpp/QrCode.hpp
View File

@ -247,12 +247,6 @@ class QrCode final {
private: void applyMask(int mask); private: void applyMask(int mask);
// A messy helper function for the constructors. This QR Code must be in an unmasked state when this
// method is called. The given argument is the requested mask, which is -1 for auto or 0 to 7 for fixed.
// This method applies and returns the actual mask chosen, from 0 to 7.
private: int handleConstructorMasking(int mask);
// Calculates and returns the penalty score based on state of this QR Code's current modules. // Calculates and returns the penalty score based on state of this QR Code's current modules.
// This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score. // This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score.
private: long getPenaltyScore() const; private: long getPenaltyScore() const;