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

rename helper methods

Browse Source
This commit is contained in:
Vukašin Stepanović
2023-02-15 12:52:59 +00:00
parent bfcdb397ad
commit 935519ced5
133 changed files with 858 additions and 1044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/maxicode/detector.rs
View File

@@ -318,7 +318,7 @@ impl Circle<'_> {
pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionResult, Exceptions> {
// find concentric circles
let Some( mut circles) = find_concentric_circles(image) else {
return Err(Exceptions::notFoundEmpty());
return Err(Exceptions::notFound);
};
// we should have an idea where the center is at this point,
@@ -341,7 +341,7 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionRe
if try_harder {
continue;
}else {
return Err(Exceptions::notFoundEmpty())
return Err(Exceptions::notFound)
}
};
let grid_sampler = DefaultGridSampler::default();
@@ -378,7 +378,7 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionRe
if try_harder {
continue;
}else {
return Err(Exceptions::notFoundEmpty())
return Err(Exceptions::notFound)
}
};
return Ok(MaxicodeDetectionResult {
@@ -392,7 +392,7 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionRe
});
}
Err(Exceptions::notFoundEmpty())
Err(Exceptions::notFound)
}
/// Locate concentric circles.
@@ -734,7 +734,7 @@ fn box_symbol(
#[cfg(feature = "experimental_features")]
if is_ellipse {
// we don't deal with ellipses yet
return Err(Exceptions::notFoundEmpty());
return Err(Exceptions::notFound);
}
let mut final_rotation = 0.0;
@@ -1052,9 +1052,7 @@ fn compare_circle(a: &Circle, b: &Circle) -> std::cmp::Ordering {
/// Read appropriate bits from a bitmatrix for the maxicode decoder
pub fn read_bits(image: &BitMatrix) -> Result<BitMatrix, Exceptions> {
let enclosingRectangle = image
.getEnclosingRectangle()
.ok_or(Exceptions::notFoundEmpty())?;
let enclosingRectangle = image.getEnclosingRectangle().ok_or(Exceptions::notFound)?;
let left = enclosingRectangle[0];
let top = enclosingRectangle[1];