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

code cleanup

Browse Source
This commit is contained in:
Henry Schimke
2023-04-29 09:58:04 -05:00
parent ef999a4eb0
commit 508f5f14c5
19 changed files with 56 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/qrcode/cpp_port/detector.rs
View File

@@ -4,7 +4,8 @@ use crate::{
CenterOfRing, DMRegressionLine, FindConcentricPatternCorners, FindLeftGuardBy, Matrix,
},
DefaultGridSampler, GridSampler, Result, SamplerControl,
}, point_i,
},
point_i,
qrcode::{
decoder::{FormatInformation, Version, VersionRef},
detector::QRCodeDetectorResult,
@@ -16,10 +17,9 @@ use multimap::MultiMap;
use crate::{
common::{
cpp_essentials::{
BitMatrixCursorTrait, ConcentricPattern, Direction, EdgeTracer,
FixedPattern, GetPatternRowTP, IsPattern, LocateConcentricPattern,
PatternRow, PatternType, PatternView, ReadSymmetricPattern, RegressionLine,
RegressionLineTrait,
BitMatrixCursorTrait, ConcentricPattern, Direction, EdgeTracer, FixedPattern,
GetPatternRowTP, IsPattern, LocateConcentricPattern, PatternRow, PatternType,
PatternView, ReadSymmetricPattern, RegressionLine, RegressionLineTrait,
},
BitMatrix, PerspectiveTransform, Quadrilateral,
},
@@ -502,8 +502,16 @@ pub fn SampleQR(image: &BitMatrix, fp: &FinderPatternSet) -> Result<QRCodeDetect
}
let best = if top.err == left.err {
if top.dim > left.dim { top } else { left }
} else if top.err < left.err { top } else { left };
if top.dim > left.dim {
top
} else {
left
}
} else if top.err < left.err {
top
} else {
left
};
let mut dimension = best.dim;
let moduleSize = (best.ms + 1.0) as i32;