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

Simplified QrCode.toSvgString() in C++ and Rust, related to Java change in commit 9c670453a852.

Browse Source
This commit is contained in:
Project Nayuki 2018-08-28 21:12:38 +00:00
parent 3ead3dbb84
commit b59c181162
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpp/QrCode.cpp
View File

@ -174,13 +174,10 @@ std::string QrCode::toSvgString(int border) const {
sb << (size + border * 2) << " " << (size + border * 2) << "\" stroke=\"none\">\n"; sb << (size + border * 2) << " " << (size + border * 2) << "\" stroke=\"none\">\n";
sb << "\t<rect width=\"100%\" height=\"100%\" fill=\"#FFFFFF\"/>\n"; sb << "\t<rect width=\"100%\" height=\"100%\" fill=\"#FFFFFF\"/>\n";
sb << "\t<path d=\""; sb << "\t<path d=\"";
bool head = true;
for (int y = 0; y < size; y++) { for (int y = 0; y < size; y++) {
for (int x = 0; x < size; x++) { for (int x = 0; x < size; x++) {
if (getModule(x, y)) { if (getModule(x, y)) {
if (head) if (x != 0 || y != 0)
head = false;
else
sb << " "; sb << " ";
sb << "M" << (x + border) << "," << (y + border) << "h1v1h-1z"; sb << "M" << (x + border) << "," << (y + border) << "h1v1h-1z";
} }

5
rust/src/lib.rs
View File

@ -252,13 +252,10 @@ impl QrCode {
"<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 {0} {0}\" stroke=\"none\">\n", dimension); "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 {0} {0}\" stroke=\"none\">\n", dimension);
result += "\t<rect width=\"100%\" height=\"100%\" fill=\"#FFFFFF\"/>\n"; result += "\t<rect width=\"100%\" height=\"100%\" fill=\"#FFFFFF\"/>\n";
result += "\t<path d=\""; result += "\t<path d=\"";
let mut head = true;
for y in 0 .. self.size { for y in 0 .. self.size {
for x in 0 .. self.size { for x in 0 .. self.size {
if self.get_module(x, y) { if self.get_module(x, y) {
if head { if x != 0 || y != 0 {
head = false;
} else {
result += " "; result += " ";
} }
result += &format!("M{},{}h1v1h-1z", x + border, y + border); result += &format!("M{},{}h1v1h-1z", x + border, y + border);