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

cargo fmt

Browse Source
This commit is contained in:
Henry Schimke
2022-12-16 11:17:34 -06:00
parent 04c4c146b7
commit 7258dcc4b3
3 changed files with 100 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/oned/rss/expanded/rss_expanded_image_2_binary_test_tase.rs
View File

@@ -30,8 +30,11 @@ use std::rc::Rc;
* @author Pablo Orduña, University of Deusto (pablo.orduna@deusto.es) * @author Pablo Orduña, University of Deusto (pablo.orduna@deusto.es)
* @author Eduardo Castillejo, University of Deusto (eduardo.castillejo@deusto.es) * @author Eduardo Castillejo, University of Deusto (eduardo.castillejo@deusto.es)
*/ */
use crate::{
use crate::{common::{BitArray, GlobalHistogramBinarizer}, BinaryBitmap, BufferedImageLuminanceSource, oned::rss::expanded::RSSExpandedReader}; common::{BitArray, GlobalHistogramBinarizer},
oned::rss::expanded::RSSExpandedReader,
BinaryBitmap, BufferedImageLuminanceSource,
};
use super::bit_array_builder; use super::bit_array_builder;
@@ -45,7 +48,10 @@ use super::bit_array_builder;
#[test] #[test]
fn testDecodeRow2binary2() { fn testDecodeRow2binary2() {
// (01)90012345678908(3103)001750 // (01)90012345678908(3103)001750
assertCorrectImage2binary("2.png", " ..X..... ......X. .XXX.X.X .X...XX. XXXXX.XX XX.X.... .XX.XX.X .XX."); assertCorrectImage2binary(
"2.png",
" ..X..... ......X. .XXX.X.X .X...XX. XXXXX.XX XX.X.... .XX.XX.X .XX.",
);
} }
#[test] #[test]
@@ -65,7 +71,9 @@ use super::bit_array_builder;
fn testDecodeRow2binary5() { fn testDecodeRow2binary5() {
// (01)90614141000015(3202)000150 // (01)90614141000015(3202)000150
assertCorrectImage2binary( assertCorrectImage2binary(
"5.png", " ..X.X... .XXXX.X. XX..XXXX ....XX.. X....... ....X... ....X..X .XX."); "5.png",
" ..X.X... .XXXX.X. XX..XXXX ....XX.. X....... ....X... ....X..X .XX.",
);
} }
#[test] #[test]
@@ -86,14 +94,18 @@ use super::bit_array_builder;
fn testDecodeRow2binary12() { fn testDecodeRow2binary12() {
// (01)98898765432106(3103)001750 // (01)98898765432106(3103)001750
assertCorrectImage2binary( assertCorrectImage2binary(
"12.png", " ..X..XX. XXXX..XX X.XX.XX. .X....XX XXX..XX. X..X.... .XX.XX.X .XX."); "12.png",
" ..X..XX. XXXX..XX X.XX.XX. .X....XX XXX..XX. X..X.... .XX.XX.X .XX.",
);
} }
#[test] #[test]
fn testDecodeRow2binary13() { fn testDecodeRow2binary13() {
// (01)90012345678908(3922)795 // (01)90012345678908(3922)795
assertCorrectImage2binary( assertCorrectImage2binary(
"13.png", " ..XX..X. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. X.X.XXXX .X..X..X ......X."); "13.png",
" ..XX..X. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. X.X.XXXX .X..X..X ......X.",
);
} }
#[test] #[test]
@@ -159,19 +171,24 @@ use super::bit_array_builder;
"22.png", " ..XXXXXX ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); "22.png", " ..XXXXXX ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX..");
} }
fn assertCorrectImage2binary( fileName:&str, expected:&str) fn assertCorrectImage2binary(fileName: &str, expected: &str) {
{
let path = format!("test_resources/blackbox/rssexpanded-1/{}", fileName); let path = format!("test_resources/blackbox/rssexpanded-1/{}", fileName);
let image = image::open(path).expect("file exists"); let image = image::open(path).expect("file exists");
let binaryMap = BinaryBitmap::new(Rc::new( GlobalHistogramBinarizer::new(Box::new(BufferedImageLuminanceSource::new(image))))); let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new(
BufferedImageLuminanceSource::new(image),
))));
let rowNumber = binaryMap.getHeight() / 2; let rowNumber = binaryMap.getHeight() / 2;
let row = binaryMap.getBlackRow(rowNumber, &mut BitArray::new()).expect("row"); let row = binaryMap
.getBlackRow(rowNumber, &mut BitArray::new())
.expect("row");
// let pairs = Vec::new(); // let pairs = Vec::new();
// try { // try {
let mut rssExpandedReader = RSSExpandedReader::new(); let mut rssExpandedReader = RSSExpandedReader::new();
let pairs = rssExpandedReader.decodeRow2pairs(rowNumber as u32, &row).expect("decode"); let pairs = rssExpandedReader
.decodeRow2pairs(rowNumber as u32, &row)
.expect("decode");
// } catch (ReaderException re) { // } catch (ReaderException re) {
// fail(re.toString()); // fail(re.toString());
// return; // return;

15
src/oned/rss/expanded/rss_expanded_reader.rs
View File

@@ -1028,6 +1028,19 @@ impl RSSExpandedReader {
impl Default for RSSExpandedReader { impl Default for RSSExpandedReader {
fn default() -> Self { fn default() -> Self {
Self { _possibleLeftPairs: Default::default(), _possibleRightPairs: Default::default(), decodeFinderCounters: Default::default(), dataCharacterCounters: Default::default(), oddRoundingErrors: Default::default(), evenRoundingErrors: Default::default(), oddCounts: Default::default(), evenCounts: Default::default(), pairs: Default::default(), rows: Default::default(), startEnd: Default::default(), startFromEven: Default::default() } Self {
_possibleLeftPairs: Default::default(),
_possibleRightPairs: Default::default(),
decodeFinderCounters: Default::default(),
dataCharacterCounters: Default::default(),
oddRoundingErrors: Default::default(),
evenRoundingErrors: Default::default(),
oddCounts: Default::default(),
evenCounts: Default::default(),
pairs: Default::default(),
rows: Default::default(),
startEnd: Default::default(),
startFromEven: Default::default(),
}
} }
} }