ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-26 04:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup bit_matrix

Browse Source
This commit is contained in:
Henry Schimke
2023-01-03 11:56:21 -06:00
parent 8543cbb98c
commit c65eadf102
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/bit_matrix.rs
View File

@@ -427,7 +427,7 @@ impl BitMatrix {
let newWidth = self.height; let newWidth = self.height;
let newHeight = self.width; let newHeight = self.width;
let newRowSize = (newWidth + 31) / 32; let newRowSize = (newWidth + 31) / 32;
let mut newBits = vec![0; (newRowSize * newHeight).try_into().unwrap()]; let mut newBits = vec![0; (newRowSize * newHeight) as usize];
for y in 0..self.height { for y in 0..self.height {
//for (int y = 0; y < height; y++) { //for (int y = 0; y < height; y++) {
@@ -435,16 +435,14 @@ impl BitMatrix {
//for (int x = 0; x < width; x++) { //for (int x = 0; x < width; x++) {
let offset = y as usize * self.row_size + (x as usize / 32); let offset = y as usize * self.row_size + (x as usize / 32);
if ((self.bits[offset] >> (x & 0x1f)) & 1) != 0 { if ((self.bits[offset] >> (x & 0x1f)) & 1) != 0 {
let newOffset: usize = ((newHeight - 1 - x) * newRowSize + (y / 32)) let newOffset: usize = ((newHeight - 1 - x) * newRowSize + (y / 32)) as usize;
.try_into()
.unwrap();
newBits[newOffset] |= 1 << (y & 0x1f); newBits[newOffset] |= 1 << (y & 0x1f);
} }
} }
} }
self.width = newWidth; self.width = newWidth;
self.height = newHeight; self.height = newHeight;
self.row_size = newRowSize.try_into().unwrap(); self.row_size = newRowSize as usize;
self.bits = newBits; self.bits = newBits;
} }