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

use internal BinaryBitmap instead of [bool]

Browse Source
This commit is contained in:
Henry Schimke
2023-04-22 16:23:32 -05:00
parent bec7c99dbb
commit b4f99b3195
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,8 @@ pub fn CheckSymmetricPattern<
let mut range = range; let mut range = range;
let mut curFwd: FastEdgeToEdgeCounter = FastEdgeToEdgeCounter::new(cur); let mut curFwd: FastEdgeToEdgeCounter = FastEdgeToEdgeCounter::new(cur);
let mut curBwd: FastEdgeToEdgeCounter = FastEdgeToEdgeCounter::new(&cur.turnedBack()); let binding = cur.turnedBack();
let mut curBwd: FastEdgeToEdgeCounter = FastEdgeToEdgeCounter::new(&binding);
let centerFwd = curFwd.stepToNextEdge(range as u32) as i32; let centerFwd = curFwd.stepToNextEdge(range as u32) as i32;
if centerFwd == 0 { if centerFwd == 0 {

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

@@ -2,7 +2,7 @@ use crate::common::BitMatrix;
use super::BitMatrixCursorTrait; use super::BitMatrixCursorTrait;
pub struct FastEdgeToEdgeCounter { pub struct FastEdgeToEdgeCounter<'a> {
// const uint8_t* p = nullptr; // const uint8_t* p = nullptr;
// int stride = 0; // int stride = 0;
// int stepsToBorder = 0; // int stepsToBorder = 0;
@@ -11,10 +11,10 @@ pub struct FastEdgeToEdgeCounter {
stepsToBorder: i32, // = 0; stepsToBorder: i32, // = 0;
//arr: BitArray, //arr: BitArray,
_arr: isize, _arr: isize,
under_arry: Vec<bool>//&'a BitMatrix//, under_arry: &'a BitMatrix//,Vec<bool>
} }
impl FastEdgeToEdgeCounter { impl<'a> FastEdgeToEdgeCounter<'a> {
pub fn new<T: BitMatrixCursorTrait>(cur: &T) -> FastEdgeToEdgeCounter { pub fn new<T: BitMatrixCursorTrait>(cur: &T) -> FastEdgeToEdgeCounter {
let stride = cur.d().y as isize * cur.img().width() as isize + cur.d().x as isize; let stride = cur.d().y as isize * cur.img().width() as isize + cur.d().x as isize;
let p = ((cur.p().y as isize * cur.img().width() as isize).abs() as i32 + cur.p().x as i32) as u32; // P IS SET WRONG IN REVERSE let p = ((cur.p().y as isize * cur.img().width() as isize).abs() as i32 + cur.p().x as i32) as u32; // P IS SET WRONG IN REVERSE
@@ -44,7 +44,7 @@ impl FastEdgeToEdgeCounter {
stride, stride,
stepsToBorder, stepsToBorder,
_arr: cur.p().y as isize * stride as isize, //cur.img().getRow(cur.p().y as u32), _arr: cur.p().y as isize * stride as isize, //cur.img().getRow(cur.p().y as u32),
under_arry: cur.img().into(), under_arry: cur.img()//.into(),
} }
} }
@@ -63,9 +63,9 @@ impl FastEdgeToEdgeCounter {
let idx_pt = self.get_array_check_index(steps); let idx_pt = self.get_array_check_index(steps);
if !(self.under_arry[idx_pt] // if !(self.under_arry[idx_pt]
== self.under_arry[self.p as usize]) // == self.under_arry[self.p as usize])
// if !(self.under_arry.get_index(idx_pt) == self.under_arry.get_index(self.p as usize)) if !(self.under_arry.get_index(idx_pt) == self.under_arry.get_index(self.p as usize))
{ {
break true; break true;
} }