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

slight cleanup in encoder

Browse Source
This commit is contained in:
Henry Schimke
2022-10-04 19:57:12 -05:00
parent 0435e0fb7c
commit 60bb4ec793
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qrcode/encoder/encoder.rs
View File

@@ -147,7 +147,7 @@ pub fn encode_with_hints(
)?; )?;
headerAndDataBits = BitArray::new(); headerAndDataBits = BitArray::new();
rn.getBits(&mut headerAndDataBits); rn.getBits(&mut headerAndDataBits)?;
version = rn.getVersion(); version = rn.getVersion();
} else { } else {
// Pick an encoding mode appropriate for the content. Note that this will not attempt to use // Pick an encoding mode appropriate for the content. Note that this will not attempt to use
@@ -178,7 +178,7 @@ pub fn encode_with_hints(
// Collect data within the main segment, separately, to count its size if needed. Don't add it to // Collect data within the main segment, separately, to count its size if needed. Don't add it to
// main payload yet. // main payload yet.
let mut dataBits = BitArray::new(); let mut dataBits = BitArray::new();
appendBytes(content, mode, &mut dataBits, encoding); appendBytes(content, mode, &mut dataBits, encoding)?;
if hints.contains_key(&EncodeHintType::QR_VERSION) { if hints.contains_key(&EncodeHintType::QR_VERSION) {
let versionNumber = if let EncodeHintValue::QrVersion(v) = let versionNumber = if let EncodeHintValue::QrVersion(v) =
@@ -212,7 +212,7 @@ pub fn encode_with_hints(
} else { } else {
content.len() content.len()
}; };
appendLengthInfo(numLetters as u32, version, mode, &mut headerAndDataBits); appendLengthInfo(numLetters as u32, version, mode, &mut headerAndDataBits)?;
// Put data together into the overall payload // Put data together into the overall payload
headerAndDataBits.appendBitArray(dataBits); headerAndDataBits.appendBitArray(dataBits);
} }
@@ -221,7 +221,7 @@ pub fn encode_with_hints(
let numDataBytes = version.getTotalCodewords() - ecBlocks.getTotalECCodewords(); let numDataBytes = version.getTotalCodewords() - ecBlocks.getTotalECCodewords();
// Terminate the bits properly. // Terminate the bits properly.
terminateBits(numDataBytes, &mut headerAndDataBits); terminateBits(numDataBytes, &mut headerAndDataBits)?;
// Interleave data bits with error correction code. // Interleave data bits with error correction code.
let finalBits = interleaveWithECBytes( let finalBits = interleaveWithECBytes(
@@ -269,7 +269,7 @@ pub fn encode_with_hints(
qrCode.setMaskPattern(maskPattern); qrCode.setMaskPattern(maskPattern);
// Build the matrix and set it to "qrCode". // Build the matrix and set it to "qrCode".
matrix_util::buildMatrix(&finalBits, &ecLevel, version, maskPattern, &mut matrix); matrix_util::buildMatrix(&finalBits, &ecLevel, version, maskPattern, &mut matrix)?;
qrCode.setMatrix(matrix); qrCode.setMatrix(matrix);
Ok(qrCode) Ok(qrCode)