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 some logic in Python and Rust code.

This commit is contained in:
Project Nayuki 2018-04-13 18:56:36 +00:00
parent a54cadf25a
commit 606a2d2924
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/qrcodegen.py
View File

@ -498,12 +498,9 @@ class QrCode(object):
step = (ver * 4 + numalign * 2 + 1) // (2 * numalign - 2) * 2 step = (ver * 4 + numalign * 2 + 1) // (2 * numalign - 2) * 2
else: # C-C-C-Combo breaker! else: # C-C-C-Combo breaker!
step = 26 step = 26
result = [6] start = ver * 4 + 10
pos = ver * 4 + 10 result = [(start - i * step) for i in range(numalign - 1)] + [6]
for _ in range(numalign - 1): return list(reversed(result))
result.insert(1, pos)
pos -= step
return result
@staticmethod @staticmethod

10
rust/src/lib.rs
View File

@ -628,12 +628,10 @@ impl QrCode {
} else { // C-C-C-Combo breaker! } else { // C-C-C-Combo breaker!
26 26
}; };
let mut result = vec![6i32]; let start = (ver as i32) * 4 + 10;
let mut pos: i32 = (ver as i32) * 4 + 10; let mut result: Vec<i32> = (0 .. numalign - 1).map(|i| start - i * step).collect();
for _ in 0 .. numalign - 1 { result.push(6);
result.insert(1, pos); result.reverse();
pos -= step;
}
result result
} }
} }