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

c++ 1169e84911a8fe19a8fe21fe87a96d4afc8bbae9

Browse Source
This commit is contained in:
Henry Schimke
2023-05-30 16:12:01 -05:00
parent 22cabc2975
commit 94a2e9f418
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -613,7 +613,11 @@ pub fn FinetuneConcentricPatternCenter(
} }
// and then either at least one more ring around that // and then either at least one more ring around that
if let Some(res2) = CenterOfRings(image, res1, range, finderPatternSize / 2) { if let Some(res2) = CenterOfRings(image, res1, range, finderPatternSize / 2) {
return Some(res2); return if image.get_point(res2) {
Some(res2)
} else {
None
};
} }
// or the center can be approximated by a square // or the center can be approximated by a square
if FitSquareToPoints(image, res1, range, 1, false).is_some() { if FitSquareToPoints(image, res1, range, 1, false).is_some() {
@@ -623,27 +627,12 @@ pub fn FinetuneConcentricPatternCenter(
if let Some(res2) = if let Some(res2) =
CenterOfDoubleCross(image, res1.floor(), range, finderPatternSize / 2 + 1) CenterOfDoubleCross(image, res1.floor(), range, finderPatternSize / 2 + 1)
{ {
return Some(res2); return if image.get_point(res2) {
Some(res2)
} else {
None
};
} }
} }
None None
// // make sure we have at least one path of white around the center
// let res = CenterOfRing(image, center, range, 1, false)?;
// let center = res;
// let mut res = CenterOfRings(image, center, range, finderPatternSize / 2);
// if res.is_none() || !image.get_point(res?) {
// res = CenterOfDoubleCross(image, center, range, finderPatternSize / 2 + 1);
// }
// if res.is_none() || !image.get_point(res?) {
// res = Some(center);
// }
// if res.is_none() || !image.get_point(res?) {
// return None;
// }
// res
} }