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

datamatrix integration passes

Browse Source
This commit is contained in:
Henry Schimke
2022-11-28 11:51:26 -06:00
parent ba02512695
commit 75e69bc498
14 changed files with 131 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/datamatrix/detector/detector.rs
View File

@@ -48,8 +48,8 @@ impl Detector {
pub fn detect(&self) -> Result<DatamatrixDetectorResult, Exceptions> {
let cornerPoints = self.rectangleDetector.detect()?;
let mut points = self.detectSolid1(&cornerPoints);
points = self.detectSolid2(&points);
let mut points = self.detectSolid1(cornerPoints);
points = self.detectSolid2(points);
if let Some(point) = self.correctTopRight(&points) {
points[3] = point;
} else {
@@ -59,7 +59,7 @@ impl Detector {
// if points[3] == null {
// throw NotFoundException.getNotFoundInstance();
// }
points = self.shiftToModuleCenter(&points);
points = self.shiftToModuleCenter(points);
let topLeft = points[0];
let bottomLeft = points[1];
@@ -125,7 +125,7 @@ impl Detector {
/**
* Detect a solid side which has minimum transition.
*/
fn detectSolid1(&self, cornerPoints: &[RXingResultPoint]) -> [RXingResultPoint; 4] {
fn detectSolid1(&self, cornerPoints: Vec<RXingResultPoint>) -> [RXingResultPoint; 4] {
// 0 2
// 1 3
let pointA = cornerPoints[0];
@@ -170,7 +170,7 @@ impl Detector {
/**
* Detect a second solid side next to first solid side.
*/
fn detectSolid2(&self, points: &[RXingResultPoint]) -> [RXingResultPoint; 4] {
fn detectSolid2(&self, points: [RXingResultPoint;4]) -> [RXingResultPoint; 4] {
// A..D
// : :
// B--C
@@ -262,7 +262,7 @@ impl Detector {
/**
* Shift the edge points to the module center.
*/
fn shiftToModuleCenter(&self, points: &[RXingResultPoint]) -> [RXingResultPoint; 4] {
fn shiftToModuleCenter(&self, points: [RXingResultPoint;4]) -> [RXingResultPoint; 4] {
// A..D
// | :
// B--C