Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve RXingResultPoint usage #13

Merged
merged 19 commits into from
Feb 17, 2023
Merged

Improve RXingResultPoint usage #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6b7099a
remove indirection for RxingResultPoint
Asha20 Feb 15, 2023
049d277
refactor aztec Detector::expand_square
Asha20 Feb 15, 2023
4a35cb6
use Self::new() for point creation
Asha20 Feb 16, 2023
15280d5
Merge branch 'main' into pr/point_refactor
Asha20 Feb 16, 2023
dbc6ca4
wip: Search & replace RXingResultPoint with Point
Asha20 Feb 16, 2023
05e377e
add aliases so the OneDReader proc macro compiles
Asha20 Feb 16, 2023
844ffc3
cargo fmt
Asha20 Feb 16, 2023
79d9b28
remove MathUtils::distance()
Asha20 Feb 16, 2023
71128a8
remove MathUtils::round()
Asha20 Feb 16, 2023
868a9b2
remove MathUtils module
Asha20 Feb 16, 2023
39b4866
add point(x: f32, y: f32) function
Asha20 Feb 16, 2023
3881df6
Remove result_point_utils::distance()
Asha20 Feb 16, 2023
41150a8
re-add RXingResultPointCallback for backwards-compat
Asha20 Feb 16, 2023
00f007f
refactor orderBestPatterns to not use ResultPoint
Asha20 Feb 16, 2023
9889555
refactor ResultPoint trait bounds into Into<Point> bounds
Asha20 Feb 16, 2023
0992e85
remove ResultPoint trait uses of Point
Asha20 Feb 16, 2023
072d3d0
change PointCallback to accept Point instead of ResultPoint
Asha20 Feb 16, 2023
1322f7d
remove impl ResultPoint for FinderPattern & AlignmentPattern
Asha20 Feb 16, 2023
4c99874
Merge branch 'main' into pr/point_refactor
Asha20 Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/aztec/DecoderTest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// import com.google.zxing.aztec.encoder.EncoderTest;

// import com.google.zxing.FormatException;
// import com.google.zxing.RXingResultPoint;
// import com.google.zxing.Point;
// import com.google.zxing.aztec.AztecDetectorRXingResult;
// import com.google.zxing.common.BitArray;
// import com.google.zxing.common.BitMatrix;
Expand All @@ -29,7 +29,7 @@
use crate::{
aztec::shared_test_methods::{stripSpace, toBitArray, toBooleanArray},
common::BitMatrix,
RXingResultPoint,
Point,
};

use super::{aztec_detector_result::AztecDetectorRXingResult, decoder};
Expand All @@ -38,7 +38,7 @@ use super::{aztec_detector_result::AztecDetectorRXingResult, decoder};
* Tests {@link Decoder}.
*/

const NO_POINTS: [RXingResultPoint; 4] = [RXingResultPoint { x: 0.0, y: 0.0 }; 4];
const NO_POINTS: [Point; 4] = [Point { x: 0.0, y: 0.0 }; 4];

#[test]
fn test_high_level_decode() {
Expand Down
13 changes: 8 additions & 5 deletions src/aztec/DetectorTest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ use rand::Rng;
use crate::{aztec::decoder, common::BitMatrix, exceptions::Exceptions};

use super::{
detector::{self, Detector, Point},
detector::{self, AztecPoint, Detector},
encoder::{self, AztecCode},
};

Expand Down Expand Up @@ -261,7 +261,7 @@ fn clone(input: &BitMatrix) -> BitMatrix {
result
}

fn get_orientation_points(code: &AztecCode) -> Vec<Point> {
fn get_orientation_points(code: &AztecCode) -> Vec<AztecPoint> {
let center = code.getMatrix().getWidth() as i32 / 2;
let offset = if code.isCompact() { 5 } else { 7 };
let mut result = Vec::new();
Expand All @@ -271,12 +271,15 @@ fn get_orientation_points(code: &AztecCode) -> Vec<Point> {
let mut ySign: i32 = -1;
while ySign <= 1 {
// for (int ySign = -1; ySign <= 1; ySign += 2) {
result.push(Point::new(center + xSign * offset, center + ySign * offset));
result.push(Point::new(
result.push(AztecPoint::new(
center + xSign * offset,
center + ySign * offset,
));
result.push(AztecPoint::new(
center + xSign * (offset - 1),
center + ySign * offset,
));
result.push(Point::new(
result.push(AztecPoint::new(
center + xSign * offset,
center + ySign * (offset - 1),
));
Expand Down
4 changes: 2 additions & 2 deletions src/aztec/EncoderTest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use crate::{
encoder::HighLevelEncoder,
shared_test_methods::{stripSpace, toBitArray, toBooleanArray},
},
BarcodeFormat, EncodeHintType, EncodeHintValue, RXingResultPoint,
BarcodeFormat, EncodeHintType, EncodeHintValue, Point,
};

use super::{encoder::aztec_encoder, AztecWriter};
Expand All @@ -50,7 +50,7 @@ const WINDOWS_1252: EncodingRef = encoding::all::WINDOWS_1252; //Charset.forName

// const DOTX: &str = "[^.X]";
// const SPACES: &str = "\\s+";
const NO_POINTS: [RXingResultPoint; 4] = [RXingResultPoint { x: 0.0, y: 0.0 }; 4];
const NO_POINTS: [Point; 4] = [Point { x: 0.0, y: 0.0 }; 4];

// real life tests

Expand Down
10 changes: 5 additions & 5 deletions src/aztec/aztec_detector_result.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

// package com.google.zxing.aztec;

// import com.google.zxing.RXingResultPoint;
// import com.google.zxing.Point;
// import com.google.zxing.common.BitMatrix;
// import com.google.zxing.common.DetectorRXingResult;

use crate::{
common::{BitMatrix, DetectorRXingResult},
RXingResultPoint,
Point,
};

/**
Expand All @@ -33,7 +33,7 @@ use crate::{
*/
pub struct AztecDetectorRXingResult {
bits: BitMatrix,
points: [RXingResultPoint; 4],
points: [Point; 4],
compact: bool,
nbDatablocks: u32,
nbLayers: u32,
Expand All @@ -44,15 +44,15 @@ impl DetectorRXingResult for AztecDetectorRXingResult {
&self.bits
}

fn getPoints(&self) -> &[RXingResultPoint] {
fn getPoints(&self) -> &[Point] {
&self.points
}
}

impl AztecDetectorRXingResult {
pub fn new(
bits: BitMatrix,
points: [RXingResultPoint; 4],
points: [Point; 4],
compact: bool,
nbDatablocks: u32,
nbLayers: u32,
Expand Down
2 changes: 1 addition & 1 deletion src/aztec/aztec_reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ impl Reader for AztecReader {
{
// if let DecodeHintValue::NeedResultPointCallback(cb) = rpcb {
for point in points {
cb(point);
cb(*point);
}
// }
}
Expand Down
Loading