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

Fixed logic errors in Rust library code.

This commit is contained in:
Project Nayuki 2017-08-27 23:48:16 +00:00
parent 1950574bda
commit dd9d822950
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rust/src/lib.rs
View File

@ -107,7 +107,9 @@ impl QrCode {
}
// Add terminator and pad up to a byte if applicable
let numzerobits = std::cmp::min(4, datacapacitybits - bb.len()) + (bb.len().wrapping_neg() & 7);
let numzerobits = std::cmp::min(4, datacapacitybits - bb.len());
append_bits(&mut bb, 0, numzerobits as u8);
let numzerobits = bb.len().wrapping_neg() & 7;
append_bits(&mut bb, 0, numzerobits as u8);
// Pad with alternate bytes until data capacity is reached
@ -363,7 +365,7 @@ impl QrCode {
let mut k: usize = 0;
for i in 0 .. numblocks {
let mut dat: Vec<u8> = Vec::with_capacity(shortblocklen + 1);
dat.copy_from_slice(&data[k .. k + shortblocklen - blockecclen + ((i < numshortblocks) as usize)]);
dat.extend_from_slice(&data[k .. k + shortblocklen - blockecclen + ((i >= numshortblocks) as usize)]);
k += dat.len();
let ecc: Vec<u8> = rs.get_remainder(&dat);
if i < numshortblocks {