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

add point(x: f32, y: f32) function

Browse Source 
Shorter than writing `Point::new`
This commit is contained in:
Vukašin Stepanović
2023-02-16 11:20:03 +00:00
parent 868a9b26de
commit 39b4866e47
22 changed files with 113 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/oned/coda_bar_reader.rs
View File

@@ -20,7 +20,7 @@ use crate::common::{BitArray, Result};
use crate::DecodeHintValue;
use crate::Exceptions;
use crate::RXingResult;
use crate::{BarcodeFormat, Point};
use crate::{point, BarcodeFormat};
use super::OneDReader;
@@ -171,8 +171,8 @@ impl OneDReader for CodaBarReader {
&self.decodeRowRXingResult,
Vec::new(),
vec![
Point::new(left, rowNumber as f32),
Point::new(right, rowNumber as f32),
point(left, rowNumber as f32),
point(right, rowNumber as f32),
],
BarcodeFormat::CODABAR,
);

6
src/oned/code_128_reader.rs
View File

@@ -18,7 +18,7 @@ use rxing_one_d_proc_derive::OneDReader;
use crate::{
common::{BitArray, Result},
BarcodeFormat, Exceptions, Point, RXingResult,
point, BarcodeFormat, Exceptions, RXingResult,
};
use super::{one_d_reader, OneDReader};
@@ -342,8 +342,8 @@ impl OneDReader for Code128Reader {
&result,
rawBytes,
vec![
Point::new(left, rowNumber as f32),
Point::new(right, rowNumber as f32),
point(left, rowNumber as f32),
point(right, rowNumber as f32),
],
BarcodeFormat::CODE_128,
);

6
src/oned/code_39_reader.rs
View File

@@ -17,7 +17,7 @@
use rxing_one_d_proc_derive::OneDReader;
use crate::common::{BitArray, Result};
use crate::{BarcodeFormat, Exceptions, Point, RXingResult};
use crate::{point, BarcodeFormat, Exceptions, RXingResult};
use super::{one_d_reader, OneDReader};
@@ -134,8 +134,8 @@ impl OneDReader for Code39Reader {
&resultString,
Vec::new(),
vec![
Point::new(left, rowNumber as f32),
Point::new(right, rowNumber as f32),
point(left, rowNumber as f32),
point(right, rowNumber as f32),
],
BarcodeFormat::CODE_39,
);

6
src/oned/code_93_reader.rs
View File

@@ -18,7 +18,7 @@ use rxing_one_d_proc_derive::OneDReader;
use crate::{
common::{BitArray, Result},
BarcodeFormat, Exceptions, Point, RXingResult,
point, BarcodeFormat, Exceptions, RXingResult,
};
use super::{one_d_reader, OneDReader};
@@ -117,8 +117,8 @@ impl OneDReader for Code93Reader {
&resultString,
Vec::new(),
vec![
Point::new(left, rowNumber as f32),
Point::new(right, rowNumber as f32),
point(left, rowNumber as f32),
point(right, rowNumber as f32),
],
BarcodeFormat::CODE_93,
);

6
src/oned/itf_reader.rs
View File

@@ -18,7 +18,7 @@ use rxing_one_d_proc_derive::OneDReader;
use crate::{
common::{BitArray, Result},
BarcodeFormat, DecodeHintValue, Exceptions, Point, RXingResult,
point, BarcodeFormat, DecodeHintValue, Exceptions, RXingResult,
};
use super::{one_d_reader, OneDReader};
@@ -150,8 +150,8 @@ impl OneDReader for ITFReader {
&resultString,
Vec::new(), // no natural byte representation for these barcodes
vec![
Point::new(startRange[1] as f32, rowNumber as f32),
Point::new(endRange[0] as f32, rowNumber as f32),
point(startRange[1] as f32, rowNumber as f32),
point(endRange[0] as f32, rowNumber as f32),
],
BarcodeFormat::ITF,
);

8
src/oned/one_d_reader.rs
View File

@@ -16,7 +16,7 @@
use crate::{
common::{BitArray, Result},
BinaryBitmap, DecodeHintType, DecodeHintValue, DecodingHintDictionary, Exceptions, Point,
point, BinaryBitmap, DecodeHintType, DecodeHintValue, DecodingHintDictionary, Exceptions,
RXingResult, RXingResultMetadataType, RXingResultMetadataValue, Reader, ResultPoint,
};
@@ -117,10 +117,8 @@ pub trait OneDReader: Reader {
// And remember to flip the result points horizontally.
let points = result.getPointsMut();
if !points.is_empty() && points.len() >= 2 {
points[0] =
Point::new(width as f32 - points[0].getX() - 1.0, points[0].getY());
points[1] =
Point::new(width as f32 - points[1].getX() - 1.0, points[1].getY());
points[0] = point(width as f32 - points[0].getX() - 1.0, points[0].getY());
points[1] = point(width as f32 - points[1].getX() - 1.0, points[1].getY());
}
}
return Ok(result);

6
src/oned/rss/finder_pattern.rs
View File

@@ -16,7 +16,7 @@
use std::hash::Hash;
use crate::Point;
use crate::{point, Point};
/**
* Encapsulates an RSS barcode finder pattern, including its start/end position and row.
@@ -34,8 +34,8 @@ impl FinderPattern {
value,
startEnd,
resultPoints: vec![
Point::new(start as f32, rowNumber as f32),
Point::new(end as f32, rowNumber as f32),
point(start as f32, rowNumber as f32),
point(end as f32, rowNumber as f32),
],
}
}

4
src/oned/rss/rss_14_reader.rs
View File

@@ -19,7 +19,7 @@ use std::collections::HashMap;
use crate::{
common::{BitArray, Result},
oned::{one_d_reader, OneDReader},
BarcodeFormat, DecodeHintType, DecodeHintValue, DecodingHintDictionary, Exceptions, Point,
point, BarcodeFormat, DecodeHintType, DecodeHintValue, DecodingHintDictionary, Exceptions,
RXingResult, RXingResultMetadataType, RXingResultMetadataValue, Reader,
};
@@ -259,7 +259,7 @@ impl RSS14Reader {
// row is actually reversed
center = row.getSize() as f32 - 1.0 - center;
}
cb(&Point::new(center, rowNumber as f32));
cb(&point(center, rowNumber as f32));
}
let outside = self.decodeDataCharacter(row, &pattern, true)?;

6
src/oned/upc_ean_extension_2_support.rs
View File

@@ -18,7 +18,7 @@ use std::collections::HashMap;
use crate::{
common::{BitArray, Result},
BarcodeFormat, Exceptions, Point, RXingResult, RXingResultMetadataType,
point, BarcodeFormat, Exceptions, RXingResult, RXingResultMetadataType,
RXingResultMetadataValue,
};
@@ -49,11 +49,11 @@ impl UPCEANExtension2Support {
&resultString,
Vec::new(),
vec![
Point::new(
point(
(extensionStartRange[0] + extensionStartRange[1]) as f32 / 2.0,
rowNumber as f32,
),
Point::new(end as f32, rowNumber as f32),
point(end as f32, rowNumber as f32),
],
BarcodeFormat::UPC_EAN_EXTENSION,
);

6
src/oned/upc_ean_extension_5_support.rs
View File

@@ -18,7 +18,7 @@ use std::collections::HashMap;
use crate::{
common::{BitArray, Result},
BarcodeFormat, Exceptions, Point, RXingResult, RXingResultMetadataType,
point, BarcodeFormat, Exceptions, RXingResult, RXingResultMetadataType,
RXingResultMetadataValue,
};
@@ -51,11 +51,11 @@ impl UPCEANExtension5Support {
&resultString,
Vec::new(),
vec![
Point::new(
point(
(extensionStartRange[0] + extensionStartRange[1]) as f32 / 2.0,
rowNumber as f32,
),
Point::new(end as f32, rowNumber as f32),
point(end as f32, rowNumber as f32),
],
BarcodeFormat::UPC_EAN_EXTENSION,
);

12
src/oned/upc_ean_reader.rs
View File

@@ -16,7 +16,7 @@
use crate::{
common::{BitArray, Result},
BarcodeFormat, DecodeHintType, DecodeHintValue, Exceptions, Point, RXingResult,
point, BarcodeFormat, DecodeHintType, DecodeHintValue, Exceptions, RXingResult,
RXingResultMetadataType, RXingResultMetadataValue, Reader,
};
@@ -156,7 +156,7 @@ pub trait UPCEANReader: OneDReader {
let mut symbologyIdentifier = 0;
if let Some(DecodeHintValue::NeedResultPointCallback(cb)) = resultPointCallback {
cb(&Point::new(
cb(&point(
(startGuardRange[0] + startGuardRange[1]) as f32 / 2.0,
rowNumber as f32,
));
@@ -166,13 +166,13 @@ pub trait UPCEANReader: OneDReader {
let endStart = self.decodeMiddle(row, startGuardRange, &mut result)?;
if let Some(DecodeHintValue::NeedResultPointCallback(cb)) = resultPointCallback {
cb(&Point::new(endStart as f32, rowNumber as f32));
cb(&point(endStart as f32, rowNumber as f32));
}
let endRange = self.decodeEnd(row, endStart)?;
if let Some(DecodeHintValue::NeedResultPointCallback(cb)) = resultPointCallback {
cb(&Point::new(
cb(&point(
(endRange[0] + endRange[1]) as f32 / 2.0,
rowNumber as f32,
));
@@ -204,8 +204,8 @@ pub trait UPCEANReader: OneDReader {
&resultString,
Vec::new(), // no natural byte representation for these barcodes
vec![
Point::new(left, rowNumber as f32),
Point::new(right, rowNumber as f32),
point(left, rowNumber as f32),
point(right, rowNumber as f32),
],
format,
);