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

partially passing encoder tests

Browse Source
This commit is contained in:
Henry
2022-10-03 20:17:41 -05:00
parent 3e80f7dd71
commit 9ec895ecc5
4 changed files with 279 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/qrcode/encoder/minimal_encoder.rs
View File

@@ -108,7 +108,7 @@ impl MinimalEncoder {
priorityCharset: EncodingRef,
isGS1: bool,
ecLevel: ErrorCorrectionLevel,
) -> Self {
) -> Self {
Self {
stringToEncode: String::from(stringToEncode),
isGS1,
@@ -553,7 +553,7 @@ impl MinimalEncoder {
for k in 0..4 {
// for (int k = 0; k < 4; k++) {
if edges[i][j][k].is_some() && i < inputLength {
let e = edges[i][j][k].clone();
let e = edges[i][j][k].clone();
self.addEdges(version, &mut edges, i, e);
}
}
@@ -584,7 +584,10 @@ impl MinimalEncoder {
}
Ok(RXingResultList::new(
version,
edges[inputLength][minimalJ.unwrap()][minimalK.unwrap()].as_ref().unwrap().clone(),
edges[inputLength][minimalJ.unwrap()][minimalK.unwrap()]
.as_ref()
.unwrap()
.clone(),
self.isGS1,
&self.ecLevel,
self.encoders.clone(),
@@ -807,18 +810,19 @@ impl RXingResultList {
));
}
}
let first = list.get(0).unwrap();
let first = list.get(0);
// prepend or insert a FNC1_FIRST_POSITION after the ECI (if any)
// if first != null && first.mode != Mode.ECI && containsECI {
list.push(RXingResultNode::new(
Mode::FNC1_FIRST_POSITION,
0,
0,
0,
encoders.clone(),
stringToEncode,
version,
));
if first.is_some() && first.as_ref().unwrap().mode != Mode::ECI && containsECI {
list.push(RXingResultNode::new(
Mode::FNC1_FIRST_POSITION,
0,
0,
0,
encoders.clone(),
stringToEncode,
version,
));
}
}
// set version to smallest version into which the bits fit.
@@ -867,6 +871,7 @@ impl RXingResultList {
versionNumber -= 1;
}
let version = Version::getVersionForNumber(versionNumber).unwrap();
list.reverse();
Self { list, version }
}