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

cargo fmt

Browse Source
This commit is contained in:
Henry Schimke
2022-12-16 16:52:24 -06:00
parent 0fbd3baef9
commit afc3ee8fa1
7 changed files with 169 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/oned/rss/expanded/rss_expanded_image_2_string_test_case.rs
View File

@@ -24,10 +24,13 @@
* http://www.piramidepse.com/
*/
use std::{rc::Rc, collections::HashMap};
use crate::{BinaryBitmap, common::{GlobalHistogramBinarizer, BitArray}, BufferedImageLuminanceSource, oned::{rss::expanded::RSSExpandedReader, OneDReader}, BarcodeFormat};
use std::{collections::HashMap, rc::Rc};
use crate::{
common::{BitArray, GlobalHistogramBinarizer},
oned::{rss::expanded::RSSExpandedReader, OneDReader},
BarcodeFormat, BinaryBitmap, BufferedImageLuminanceSource,
};
/**
* @author Pablo Orduña, University of Deusto (pablo.orduna@deusto.es)
@@ -66,13 +69,17 @@ use crate::{BinaryBitmap, common::{GlobalHistogramBinarizer, BitArray}, Buffered
#[test]
fn testDecodeRow2string10() {
let expected = "(01)98898765432106(15)991231(3103)001750(10)12A(422)123(21)123456(423)012345678901";
let expected =
"(01)98898765432106(15)991231(3103)001750(10)12A(422)123(21)123456(423)012345678901";
assertCorrectImage2string("10.png", expected);
}
#[test]
fn testDecodeRow2string11() {
assertCorrectImage2string("11.png", "(01)98898765432106(15)991231(3103)001750(10)12A(422)123(21)123456");
assertCorrectImage2string(
"11.png",
"(01)98898765432106(15)991231(3103)001750(10)12A(422)123(21)123456",
);
}
#[test]
@@ -167,25 +174,29 @@ use crate::{BinaryBitmap, common::{GlobalHistogramBinarizer, BitArray}, Buffered
#[test]
fn testDecodeRow2string32() {
assertCorrectImage2string("32.png", "(15)991231(3103)001750(10)12A(422)123(21)123456(423)0123456789012");
assertCorrectImage2string(
"32.png",
"(15)991231(3103)001750(10)12A(422)123(21)123456(423)0123456789012",
);
}
fn assertCorrectImage2string( fileName:&str, expected:&str)
{
fn assertCorrectImage2string(fileName: &str, expected: &str) {
let path = format!("test_resources/blackbox/rssexpanded-1/{}", fileName);
let image = image::open(path).expect("load image");
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 row = binaryMap.getBlackRow(rowNumber, &mut BitArray::new()).expect("get row");
let row = binaryMap
.getBlackRow(rowNumber, &mut BitArray::new())
.expect("get row");
let mut rssExpandedReader = RSSExpandedReader::new();
let result = rssExpandedReader.decodeRow(rowNumber as u32, &row, &HashMap::new()).expect("should decode");
let result = rssExpandedReader
.decodeRow(rowNumber as u32, &row, &HashMap::new())
.expect("should decode");
assert_eq!(&BarcodeFormat::RSS_EXPANDED, result.getBarcodeFormat());
assert_eq!(expected, result.getText());
}

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

@@ -24,16 +24,14 @@
* http://www.piramidepse.com/
*/
use crate::{Exceptions, common::BitArray, oned::rss::expanded::ExpandedPair, Reader};
use super::{RSSExpandedReader, test_case_util};
use crate::{common::BitArray, oned::rss::expanded::ExpandedPair, Exceptions, Reader};
use super::{test_case_util, RSSExpandedReader};
/**
* Tests {@link RSSExpandedReader} handling of stacked RSS barcodes.
*/
#[test]
fn testDecodingRowByRow() {
let mut rssExpandedReader = RSSExpandedReader::new();
@@ -41,15 +39,17 @@ use super::{RSSExpandedReader, test_case_util};
let binaryMap = test_case_util::getBinaryBitmap("1000.png");
let firstRowNumber = binaryMap.getHeight() / 3;
let firstRow = binaryMap.getBlackRow(firstRowNumber, &mut BitArray::new()).expect("get row");
let firstRow = binaryMap
.getBlackRow(firstRowNumber, &mut BitArray::new())
.expect("get row");
// let tester = ;
assert!(|| -> Result<Vec<ExpandedPair>, Exceptions> {
rssExpandedReader.decodeRow2pairs(firstRowNumber as u32, &firstRow)
// fail(NotFoundException.class.getName() + " expected");
}().is_err());
}()
.is_err());
assert_eq!(1, rssExpandedReader.getRows().len());
let firstExpandedRow = &mut rssExpandedReader.rows[0]; //&mut rssExpandedReader.getRowsMut()[0];//.expect("not None");
@@ -58,14 +58,30 @@ use super::{RSSExpandedReader, test_case_util};
assert_eq!(2, firstExpandedRow.getPairs().len());
firstExpandedRow.getPairsMut()[1].getFinderPatternMut().as_mut().unwrap().getStartEndMut()[1] = 0;
rssExpandedReader.pairs.last_mut().as_mut().unwrap().getFinderPatternMut().as_mut().unwrap().getStartEndMut()[1] = 0;
firstExpandedRow.getPairsMut()[1]
.getFinderPatternMut()
.as_mut()
.unwrap()
.getStartEndMut()[1] = 0;
rssExpandedReader
.pairs
.last_mut()
.as_mut()
.unwrap()
.getFinderPatternMut()
.as_mut()
.unwrap()
.getStartEndMut()[1] = 0;
let secondRowNumber = 2 * binaryMap.getHeight() / 3;
let mut secondRow = binaryMap.getBlackRow(secondRowNumber, &mut BitArray::new()).expect("get row");
let mut secondRow = binaryMap
.getBlackRow(secondRowNumber, &mut BitArray::new())
.expect("get row");
secondRow.reverse();
let totalPairs = rssExpandedReader.decodeRow2pairs(secondRowNumber as u32, &secondRow).expect("decode pairs");
let totalPairs = rssExpandedReader
.decodeRow2pairs(secondRowNumber as u32, &secondRow)
.expect("decode pairs");
let result = RSSExpandedReader::constructRXingResult(&totalPairs).expect("construct");
assert_eq!("(01)98898765432106(3202)012345(15)991231", result.getText());
@@ -80,4 +96,3 @@ use super::{RSSExpandedReader, test_case_util};
let result = rssExpandedReader.decode(&binaryMap).expect("decode");
assert_eq!("(01)98898765432106(3202)012345(15)991231", result.getText());
}

8
src/oned/rss/expanded/test_case_util.rs
View File

@@ -28,8 +28,7 @@ use std::rc::Rc;
use image::DynamicImage;
use crate::{BinaryBitmap, common::GlobalHistogramBinarizer, BufferedImageLuminanceSource};
use crate::{common::GlobalHistogramBinarizer, BinaryBitmap, BufferedImageLuminanceSource};
fn getBufferedImage(fileName: &str) -> DynamicImage {
let path = format!("test_resources/blackbox/rssexpandedstacked-2/{}", fileName);
@@ -41,8 +40,9 @@ use crate::{BinaryBitmap, common::GlobalHistogramBinarizer, BufferedImageLuminan
pub(crate) fn getBinaryBitmap(fileName: &str) -> BinaryBitmap {
let bufferedImage = getBufferedImage(fileName);
let binaryMap =
BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new(BufferedImageLuminanceSource::new(bufferedImage)))));
let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new(
BufferedImageLuminanceSource::new(bufferedImage),
))));
binaryMap
}