msb-public
/
QR-Code-generator
mirror of https://github.com/nayuki/QR-Code-generator
4
3
Code Issues Projects Releases Wiki Activity

Tweaked C++ code style to use assignment operator instead of constructor for simple initialization of receiving an object.

Browse Source
pull/31/head
Project Nayuki 7 years ago
parent 18f9b7c6ce
commit 6a71979c2a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
cpp/QrCode.cpp
Unescape View File

@ -50,7 +50,7 @@ int QrCode::getFormatBits(Ecc ecl) {
QrCode QrCode::encodeText(const char *text, Ecc ecl) { QrCode QrCode::encodeText(const char *text, Ecc ecl) {
vector<QrSegment> segs(QrSegment::makeSegments(text)); vector<QrSegment> segs = QrSegment::makeSegments(text);
return encodeSegments(segs, ecl); return encodeSegments(segs, ecl);
} }
@ -123,7 +123,7 @@ QrCode::QrCode(int ver, Ecc ecl, const vector<uint8_t> &dataCodewords, int mask)
// Draw function patterns, draw all codewords, do masking // Draw function patterns, draw all codewords, do masking
drawFunctionPatterns(); drawFunctionPatterns();
const vector<uint8_t> allCodewords(appendErrorCorrection(dataCodewords)); const vector<uint8_t> allCodewords = appendErrorCorrection(dataCodewords);
drawCodewords(allCodewords); drawCodewords(allCodewords);
this->mask = handleConstructorMasking(mask); this->mask = handleConstructorMasking(mask);
} }
@ -195,7 +195,7 @@ void QrCode::drawFunctionPatterns() {
drawFinderPattern(3, size - 4); drawFinderPattern(3, size - 4);
// Draw numerous alignment patterns // Draw numerous alignment patterns
const vector<int> alignPatPos(getAlignmentPatternPositions(version)); const vector<int> alignPatPos = getAlignmentPatternPositions(version);
int numAlign = alignPatPos.size(); int numAlign = alignPatPos.size();
for (int i = 0; i < numAlign; i++) { for (int i = 0; i < numAlign; i++) {
for (int j = 0; j < numAlign; j++) { for (int j = 0; j < numAlign; j++) {
@ -311,7 +311,7 @@ vector<uint8_t> QrCode::appendErrorCorrection(const vector<uint8_t> &data) const
for (int i = 0, k = 0; i < numBlocks; i++) { for (int i = 0, k = 0; i < numBlocks; i++) {
vector<uint8_t> dat(data.cbegin() + k, data.cbegin() + (k + shortBlockLen - blockEccLen + (i < numShortBlocks ? 0 : 1))); vector<uint8_t> dat(data.cbegin() + k, data.cbegin() + (k + shortBlockLen - blockEccLen + (i < numShortBlocks ? 0 : 1)));
k += dat.size(); k += dat.size();
const vector<uint8_t> ecc(rs.getRemainder(dat)); const vector<uint8_t> ecc = rs.getRemainder(dat);
if (i < numShortBlocks) if (i < numShortBlocks)
dat.push_back(0); dat.push_back(0);
dat.insert(dat.end(), ecc.cbegin(), ecc.cend()); dat.insert(dat.end(), ecc.cbegin(), ecc.cend());

Write Preview
Loading…
Cancel
Save