Merge branch 'main' into pr/point_refactor

This commit is contained in:
Vukašin Stepanović
2023-02-16 16:43:24 +00:00
132 changed files with 1048 additions and 1329 deletions

View File

@@ -50,7 +50,7 @@ impl<'a> MultiDetector<'_> {
let infos = finder.findMulti(hints)?;
if infos.is_empty() {
return Err(Exceptions::NotFoundException(None));
return Err(Exceptions::notFound);
}
let mut result = Vec::new();

View File

@@ -92,9 +92,9 @@ impl<'a> MultiFinderPatternFinder<'_> {
if size < 3 {
// Couldn't find enough finder patterns
return Err(Exceptions::NotFoundException(Some(
"Couldn't find enough finder patterns".to_owned(),
)));
return Err(Exceptions::notFoundWith(
"Couldn't find enough finder patterns",
));
}
/*
@@ -212,7 +212,7 @@ impl<'a> MultiFinderPatternFinder<'_> {
if !results.is_empty() {
Ok(results)
} else {
Err(Exceptions::NotFoundException(None))
Err(Exceptions::notFound)
}
}

View File

@@ -111,7 +111,7 @@ impl MultipleBarcodeReader for QRCodeMultiReader {
// ignore and continue
continue;
} else {
return Err(output.err().unwrap_or(Exceptions::NotFoundException(None)));
return Err(output.err().unwrap_or(Exceptions::notFound));
}
}