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

fix errors due to change in sign

Browse Source
This commit is contained in:
Henry Schimke
2023-04-01 09:43:41 -05:00
parent 8dde4744f2
commit 8e26bbe117
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/cpp_essentials/concentric_finder.rs
View File

@@ -91,14 +91,14 @@ pub fn CheckSymmetricPattern<
) -> i32 {
let mut range = range;
let curFwd: FastEdgeToEdgeCounter = FastEdgeToEdgeCounter::new(cur);
let curBwd: FastEdgeToEdgeCounter = FastEdgeToEdgeCounter::new(&cur.turnedBack());
let mut curFwd: FastEdgeToEdgeCounter = FastEdgeToEdgeCounter::new(cur);
let mut curBwd: FastEdgeToEdgeCounter = FastEdgeToEdgeCounter::new(&cur.turnedBack());
let centerFwd = curFwd.stepToNextEdge(range);
let centerFwd = curFwd.stepToNextEdge(range as u32) as i32;
if centerFwd == 0 {
return 0;
}
let centerBwd = curBwd.stepToNextEdge(range);
let centerBwd = curBwd.stepToNextEdge(range as u32) as i32;
if centerBwd == 0 {
return 0;
}
@@ -109,8 +109,8 @@ pub fn CheckSymmetricPattern<
res[s_2] = (centerFwd + centerBwd - 1) as u16; // -1 because the starting pixel is counted twice
range -= res[s_2] as i32;
let mut next = |cur: &FastEdgeToEdgeCounter, i: isize| {
let v = cur.stepToNextEdge(range);
let mut next = |cur: &mut FastEdgeToEdgeCounter, i: isize| {
let v = cur.stepToNextEdge(range as u32) as i32;
res[(s_2 as isize + i) as usize] = v as u16;
range -= v;
@@ -119,7 +119,7 @@ pub fn CheckSymmetricPattern<
for i in 1..=s_2 {
// for (int i = 1; i <= s_2; ++i) {
if next(&curFwd, i as isize) == 0 || next(&curBwd, -(i as isize)) == 0 {
if next(&mut curFwd, i as isize) == 0 || next(&mut curBwd, -(i as isize)) == 0 {
return 0;
}
}

2
src/common/cpp_essentials/fast_edge_to_edge_counter.rs
View File

@@ -47,7 +47,7 @@ impl FastEdgeToEdgeCounter {
pub fn stepToNextEdge(&mut self, range: u32) -> u32 {
let maxSteps = std::cmp::min(self.stepsToBorder, range);
let steps = 0;
let mut steps = 0;
loop {
steps += 1;
if (steps > maxSteps) {