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 pieces of Rust code.

This commit is contained in:
Project Nayuki 2019-09-12 17:26:51 +00:00
parent 765527895c
commit 9fdd05e64d
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rust/src/lib.rs
View File

@ -208,15 +208,13 @@ impl QrCode {
// Find the minimal version number to use // Find the minimal version number to use
let mut version = minversion; let mut version = minversion;
let datausedbits: usize; let datausedbits: usize = loop {
loop {
// Number of data bits available // Number of data bits available
let datacapacitybits: usize = QrCode::get_num_data_codewords(version, ecl) * 8; let datacapacitybits: usize = QrCode::get_num_data_codewords(version, ecl) * 8;
let dataused: Option<usize> = QrSegment::get_total_bits(segs, version); let dataused: Option<usize> = QrSegment::get_total_bits(segs, version);
if let Some(n) = dataused { if let Some(n) = dataused {
if n <= datacapacitybits { if n <= datacapacitybits {
datausedbits = n; break n; // This version number is found to be suitable
break; // This version number is found to be suitable
} }
} }
if version.value() >= maxversion.value() { // All versions in the range could not fit the given data if version.value() >= maxversion.value() { // All versions in the range could not fit the given data
@ -228,7 +226,7 @@ impl QrCode {
return Err(DataTooLong(msg)); return Err(DataTooLong(msg));
} }
version = Version::new(version.value() + 1); version = Version::new(version.value() + 1);
} };
// Increase the error correction level while the data still fits in the current version number // Increase the error correction level while the data still fits in the current version number
for newecl in &[QrCodeEcc::Medium, QrCodeEcc::Quartile, QrCodeEcc::High] { // From low to high for newecl in &[QrCodeEcc::Medium, QrCodeEcc::Quartile, QrCodeEcc::High] { // From low to high
@ -559,8 +557,9 @@ impl QrCode {
let rsdiv: Vec<u8> = QrCode::reed_solomon_compute_divisor(blockecclen); let rsdiv: Vec<u8> = QrCode::reed_solomon_compute_divisor(blockecclen);
let mut k: usize = 0; let mut k: usize = 0;
for i in 0 .. numblocks { for i in 0 .. numblocks {
let mut dat = data[k .. k + shortblocklen - blockecclen + usize::from(i >= numshortblocks)].to_vec(); let datlen: usize = shortblocklen - blockecclen + usize::from(i >= numshortblocks);
k += dat.len(); let mut dat = data[k .. k + datlen].to_vec();
k += datlen;
let ecc: Vec<u8> = QrCode::reed_solomon_compute_remainder(&dat, &rsdiv); let ecc: Vec<u8> = QrCode::reed_solomon_compute_remainder(&dat, &rsdiv);
if i < numshortblocks { if i < numshortblocks {
dat.push(0); dat.push(0);
@ -712,10 +711,7 @@ impl QrCode {
} }
// Balance of black and white modules // Balance of black and white modules
let mut black: i32 = 0; let black: i32 = self.modules.iter().copied().map(i32::from).sum();
for color in &self.modules {
black += i32::from(*color);
}
let total: i32 = size * size; // Note that size is odd, so black/total != 1/2 let total: i32 = size * size; // Note that size is odd, so black/total != 1/2
// Compute the smallest integer k >= 0 such that (45-5k)% <= black/total <= (55+5k)% // Compute the smallest integer k >= 0 such that (45-5k)% <= black/total <= (55+5k)%
let k: i32 = ((black * 20 - total * 10).abs() + total - 1) / total - 1; let k: i32 = ((black * 20 - total * 10).abs() + total - 1) / total - 1;