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

port of the c++ datamatrix detector

Browse Source
This commit is contained in:
Henry Schimke
2023-01-18 18:47:38 -06:00
parent c9eb6f88cf
commit 8a52d47959
17 changed files with 2000 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/datamatrix/data_matrix_reader.rs
View File

@@ -22,7 +22,10 @@ use crate::{
RXingResultMetadataType, RXingResultMetadataValue, Reader,
};
use super::{decoder::Decoder, detector::Detector};
use super::{
decoder::Decoder,
detector::{zxing_cpp_detector, Detector},
};
use once_cell::sync::Lazy;
@@ -69,13 +72,10 @@ impl Reader for DataMatrixReader {
image: &mut crate::BinaryBitmap,
hints: &crate::DecodingHintDictionary,
) -> Result<crate::RXingResult, crate::Exceptions> {
let try_harder = if let Some(DecodeHintValue::TryHarder(true)) =
hints.get(&DecodeHintType::TRY_HARDER)
{
true
} else {
false
};
let try_harder = matches!(
hints.get(&DecodeHintType::TRY_HARDER),
Some(DecodeHintValue::TryHarder(true))
);
let decoderRXingResult;
let mut points = Vec::new();
if hints.contains_key(&DecodeHintType::PURE_BARCODE) {
@@ -85,15 +85,25 @@ impl Reader for DataMatrixReader {
} else {
//Result<DatamatrixDetectorResult, Exceptions>
decoderRXingResult = if let Ok(fnd) = || -> Result<DecoderRXingResult, Exceptions> {
let detectorRXingResult = Detector::new(image.getBlackMatrix())?.detect()?;
let detectorRXingResult =
zxing_cpp_detector::detect(image.getBlackMatrix(), try_harder, true)?;
let decoded = DECODER.decode(detectorRXingResult.getBits())?;
points = detectorRXingResult.getPoints().to_vec();
Ok(decoded)
}() {
fnd
} else if try_harder {
let bits = self.extractPureBits(image.getBlackMatrix())?;
DECODER.decode(&bits)?
if let Ok(fnd) = || -> Result<DecoderRXingResult, Exceptions> {
let detectorRXingResult = Detector::new(image.getBlackMatrix())?.detect()?;
let decoded = DECODER.decode(detectorRXingResult.getBits())?;
points = detectorRXingResult.getPoints().to_vec();
Ok(decoded)
}() {
fnd
} else {
let bits = self.extractPureBits(image.getBlackMatrix())?;
DECODER.decode(&bits)?
}
} else {
return Err(Exceptions::NotFoundException(None));
};