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

Simplified C++ code with vector range constructor.

This commit is contained in:
Project Nayuki 2017-08-31 20:25:39 +00:00
parent fca2a8a27c
commit 6f9116dfcb
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpp/QrCodeGeneratorDemo.cpp
View File

@ -26,6 +26,7 @@
#include <cstdint>
#include <cstdlib>
#include <cstring>
#include <iostream>
#include <string>
#include <vector>
@ -124,9 +125,7 @@ static void doSegmentDemo() {
QrCode::Ecc::LOW);
printQr(qr2);
std::vector<uint8_t> bytes;
for (const char *temp = golden0; *temp != '\0'; temp++)
bytes.push_back(static_cast<uint8_t>(*temp));
std::vector<uint8_t> bytes(golden0, golden0 + std::strlen(golden0));
const QrCode qr3 = QrCode::encodeSegments(
{QrSegment::makeBytes(bytes), QrSegment::makeNumeric(golden1), QrSegment::makeAlphanumeric(golden2)},
QrCode::Ecc::LOW);

4
cpp/QrCodeGeneratorWorker.cpp
View File

@ -75,9 +75,7 @@ int main() {
// Make list of segments
std::vector<QrSegment> segs;
if (isAscii) {
std::vector<char> text;
for (std::vector<uint8_t>::iterator it = data.begin(); it != data.end(); ++it)
text.push_back((char)*it);
std::vector<char> text(data.cbegin(), data.cend());
text.push_back('\0');
segs = QrSegment::makeSegments(text.data());
} else