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

all qrcode tests pass

Browse Source
This commit is contained in:
Henry Schimke
2022-10-14 16:28:12 -05:00
parent 7244075501
commit 94b743a59f
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qrcode/detector/detector.rs
View File

@@ -344,7 +344,7 @@ impl Detector {
scale = (self.image.getWidth() as i32 - 1 - fromX as i32) as f32 / (otherToX - fromX as i32) as f32; scale = (self.image.getWidth() as i32 - 1 - fromX as i32) as f32 / (otherToX - fromX as i32) as f32;
otherToX = self.image.getWidth() as i32 - 1; otherToX = self.image.getWidth() as i32 - 1;
} }
let mut otherToY = fromY as i32 - (toY as i32 - fromY as i32) * scale.floor() as i32; let mut otherToY = (fromY as f32 - (toY as f32 - fromY as f32) * scale).floor() as i32;
scale = 1.0; scale = 1.0;
if otherToY < 0 { if otherToY < 0 {
@@ -354,7 +354,7 @@ impl Detector {
scale = (self.image.getHeight() as i32 - 1 - fromY as i32) as f32 / (otherToY - fromY as i32) as f32; scale = (self.image.getHeight() as i32 - 1 - fromY as i32) as f32 / (otherToY - fromY as i32) as f32;
otherToY = self.image.getHeight() as i32 - 1; otherToY = self.image.getHeight() as i32 - 1;
} }
otherToX = fromX as i32+ (otherToX - fromX as i32) * scale.floor() as i32; otherToX = (fromX as f32+ (otherToX as f32 - fromX as f32) * scale).floor() as i32;
result += self.sizeOfBlackWhiteBlackRun(fromX as u32, fromY as u32, otherToX as u32, otherToY as u32); result += self.sizeOfBlackWhiteBlackRun(fromX as u32, fromY as u32, otherToX as u32, otherToY as u32);

2
src/qrcode/detector/finder_pattern_finder.rs
View File

@@ -622,7 +622,7 @@ impl FinderPatternFinder {
// This is the case where you find top left last. // This is the case where you find top left last.
self.hasSkipped = true; self.hasSkipped = true;
let fnp = firstConfirmedCenter.unwrap(); let fnp = firstConfirmedCenter.unwrap();
return (((fnp.getX() - center.getX().abs()) return (((fnp.getX() - center.getX()).abs()
- (fnp.getY() - center.getY()).abs()) - (fnp.getY() - center.getY()).abs())
/ 2.0) / 2.0)
.floor() as u32; .floor() as u32;

2
tests/QRCodeBlackBox3TestCase.rs
View File

@@ -33,3 +33,5 @@ fn QRCodeBlackBox3TestCase() {
tester.testBlackBox(); tester.testBlackBox();
} }
// 11 - 90
// 13 - 90