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

Merge branch 'main' into pr/point_refactor

Browse Source
This commit is contained in:
Vukašin Stepanović
2023-02-16 16:43:24 +00:00
parent 1322f7defa 7b891bd858
commit 4c9987425d
132 changed files with 1048 additions and 1329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/maxicode/detector.rs
View File

@@ -316,7 +316,7 @@ impl Circle<'_> {
pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionResult> {
// find concentric circles
let Some( mut circles) = find_concentric_circles(image) else {
return Err(Exceptions::NotFoundException(None));
return Err(Exceptions::notFound);
};
// we should have an idea where the center is at this point,
@@ -339,7 +339,7 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionRe
if try_harder {
continue;
}else {
return Err(Exceptions::NotFoundException(None))
return Err(Exceptions::notFound)
}
};
let grid_sampler = DefaultGridSampler::default();
@@ -376,7 +376,7 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionRe
if try_harder {
continue;
}else {
return Err(Exceptions::NotFoundException(None))
return Err(Exceptions::notFound)
}
};
return Ok(MaxicodeDetectionResult {
@@ -390,7 +390,7 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionRe
});
}
Err(Exceptions::NotFoundException(None))
Err(Exceptions::notFound)
}
/// Locate concentric circles.
@@ -729,7 +729,7 @@ fn box_symbol(image: &BitMatrix, circle: &mut Circle) -> Result<([(f32, f32); 4]
#[cfg(feature = "experimental_features")]
if is_ellipse {
// we don't deal with ellipses yet
return Err(Exceptions::NotFoundException(None));
return Err(Exceptions::notFound);
}
let mut final_rotation = 0.0;