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

cargo fmt

Browse Source
This commit is contained in:
Henry Schimke
2023-01-27 15:25:19 -06:00
parent 42d40de755
commit 465485d1f4
7 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/result/AddressBookAUResultParser.rs
View File

@@ -88,12 +88,8 @@ fn matchMultipleValuePrefix(prefix: &str, rawText: &str) -> Vec<String> {
// For now, always 3, and always trim // For now, always 3, and always trim
for i in 1..=3 { for i in 1..=3 {
// for (int i = 1; i <= 3; i++) { // for (int i = 1; i <= 3; i++) {
let value = ResultParser::matchSinglePrefixedField( let value =
&format!("{prefix}{i}:"), ResultParser::matchSinglePrefixedField(&format!("{prefix}{i}:"), rawText, '\r', true);
rawText,
'\r',
true,
);
if value.is_none() { if value.is_none() {
break; break;
} }

10
src/maxicode/decoder/decoded_bit_stream_parser.rs
View File

@@ -101,15 +101,9 @@ pub fn decode(bytes: &[u8], mode: u8) -> Result<DecoderRXingResult, Exceptions>
let service = format!("{:0>3}", getServiceClass(bytes)); let service = format!("{:0>3}", getServiceClass(bytes));
result.push_str(&getMessage(bytes, 10, 84)); result.push_str(&getMessage(bytes, 10, 84));
if result.starts_with(&format!("[)>{}{}{}", RS, "01", GS)) { if result.starts_with(&format!("[)>{}{}{}", RS, "01", GS)) {
result.insert_str( result.insert_str(9, &format!("{postcode}{GS}{country}{GS}{service}{GS}"));
9,
&format!("{postcode}{GS}{country}{GS}{service}{GS}"),
);
} else { } else {
result.insert_str( result.insert_str(0, &format!("{postcode}{GS}{country}{GS}{service}{GS}"));
0,
&format!("{postcode}{GS}{country}{GS}{service}{GS}"),
);
} }
} }
4 => { 4 => {

2
src/maxicode/detector.rs
View File

@@ -141,7 +141,7 @@ impl<'a> Circle<'_> {
let mut lengths = [(0, 0.0, [(0.0_f32, 0.0); 2]); 72]; let mut lengths = [(0, 0.0, [(0.0_f32, 0.0); 2]); 72];
let mut circle_points = Vec::new(); let mut circle_points = Vec::new();
// for i_rotation in 0..72 { // for i_rotation in 0..72 {
for (i_rotation, length_set) in lengths.iter_mut().enumerate(){ for (i_rotation, length_set) in lengths.iter_mut().enumerate() {
let rotation = i_rotation as f32 * 5.0; let rotation = i_rotation as f32 * 5.0;
let (length, points) = self.find_width_at_degree(rotation); let (length, points) = self.find_width_at_degree(rotation);
circle_points.extend_from_slice(&points); circle_points.extend_from_slice(&points);

13
src/oned/rss/expanded/decoders/ai_013103_decoder.rs
View File

@@ -82,18 +82,14 @@ mod AI013103DecoderTest {
#[test] #[test]
fn test0131031() { fn test0131031() {
let data = format!( let data = format!("{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}");
"{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}"
);
let expected = "(01)90012345678908(3103)001750"; let expected = "(01)90012345678908(3103)001750";
assertCorrectBinaryString(&data, expected); assertCorrectBinaryString(&data, expected);
} }
#[test] #[test]
fn test0131032() { fn test0131032() {
let data = format!( let data = format!("{HEADER}{COMPRESSED_GTIN900000000000008}{COMPRESSED15BIT_WEIGHT0}");
"{HEADER}{COMPRESSED_GTIN900000000000008}{COMPRESSED15BIT_WEIGHT0}"
);
let expected = "(01)90000000000003(3103)000000"; let expected = "(01)90000000000003(3103)000000";
assertCorrectBinaryString(&data, expected); assertCorrectBinaryString(&data, expected);
} }
@@ -101,9 +97,8 @@ mod AI013103DecoderTest {
#[test] #[test]
#[should_panic] #[should_panic]
fn test013103invalid() { fn test013103invalid() {
let data = format!( let data =
"{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}.." format!("{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}..");
);
assertCorrectBinaryString(&data, ""); assertCorrectBinaryString(&data, "");
} }
} }

8
src/oned/rss/expanded/decoders/ai_0132023203_decoder_test.rs
View File

@@ -34,9 +34,7 @@ const HEADER: &str = "..X.X";
#[test] #[test]
fn test0132021() { fn test0132021() {
let data = format!( let data = format!("{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}");
"{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}"
);
let expected = "(01)90012345678908(3202)001750"; let expected = "(01)90012345678908(3202)001750";
assertCorrectBinaryString(&data, expected); assertCorrectBinaryString(&data, expected);
@@ -44,9 +42,7 @@ fn test0132021() {
#[test] #[test]
fn test0132031() { fn test0132031() {
let data = format!( let data = format!("{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT11750}");
"{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT11750}"
);
let expected = "(01)90012345678908(3203)001750"; let expected = "(01)90012345678908(3203)001750";
assertCorrectBinaryString(&data, expected); assertCorrectBinaryString(&data, expected);

4
src/oned/rss/expanded/decoders/any_ai_decoder.rs
View File

@@ -107,9 +107,7 @@ mod AnyAIDecoderTest {
#[test] #[test]
fn testAnyAIDecoderalphaFNC1() { fn testAnyAIDecoderalphaFNC1() {
let data = format!( let data = format!("{HEADER}{NUMERIC10}{NUMERIC2ALPHA}{ALPHA_A}{ALPHA_FNC1}");
"{HEADER}{NUMERIC10}{NUMERIC2ALPHA}{ALPHA_A}{ALPHA_FNC1}"
);
let expected = "(10)A"; let expected = "(10)A";
assertCorrectBinaryString(&data, expected); assertCorrectBinaryString(&data, expected);

5
src/oned/rss/expanded/rss_expanded_internal_test_case.rs
View File

@@ -171,10 +171,7 @@ fn testDecodeDataCharacter() {
} }
fn readImage(fileName: &str) -> image::DynamicImage { fn readImage(fileName: &str) -> image::DynamicImage {
image::open(format!( image::open(format!("test_resources/blackbox/rssexpanded-1/{fileName}")).unwrap()
"test_resources/blackbox/rssexpanded-1/{fileName}"
))
.unwrap()
// Path path = AbstractBlackBoxTestCase.buildTestBase("src/test/resources/blackbox/rssexpanded-1/").resolve(fileName); // Path path = AbstractBlackBoxTestCase.buildTestBase("src/test/resources/blackbox/rssexpanded-1/").resolve(fileName);
// return ImageIO.read(path.toFile()); // return ImageIO.read(path.toFile());
} }