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

chore: clippy cleanup

Browse Source
This commit is contained in:
Henry Schimke
2024-01-13 14:02:02 -06:00
parent 7d6a3ced04
commit f4d9766275
8 changed files with 41 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/cpp_essentials/base_extentions/qr_formatinformation.rs
View File

@@ -103,7 +103,7 @@ impl FormatInformation {
pub fn DecodeRMQR(formatInfoBits1: u32, formatInfoBits2: u32) -> Self {
//FormatInformation fi;
let mirror18Bits = |bits: u32| bits.reverse_bits() >> 14;
let mut fi = if (formatInfoBits2 != 0) {
let mut fi = if formatInfoBits2 != 0 {
Self::FindBestFormatInfoRMQR(
&[formatInfoBits1, mirror18Bits(formatInfoBits1)],
&[formatInfoBits2, mirror18Bits(formatInfoBits2)],
@@ -218,7 +218,7 @@ impl FormatInformation {
let pattern = l_pattern ^ mask;
// Find the pattern with fewest bits differing
let hammingDist = ((bits[bitsIndex] ^ mask) ^ pattern).count_ones();
if (hammingDist < fi.hammingDistance) {
if hammingDist < fi.hammingDistance {
fi.mask = mask; // store the used mask to discriminate between types/models
fi.data = pattern >> 12; // drop the 12 BCH error correction bits
fi.hammingDistance = hammingDist;
@@ -229,7 +229,7 @@ impl FormatInformation {
};
best(bits, &MASKED_PATTERNS, FORMAT_INFO_MASK_RMQR);
if (!subbits.is_empty())
if !subbits.is_empty()
// TODO probably remove if `sampleRMQR()` done properly
{
best(subbits, &MASKED_PATTERNS_SUB, FORMAT_INFO_MASK_RMQR_SUB);

14
src/common/cpp_essentials/base_extentions/qrcode_version.rs
View File

@@ -77,10 +77,10 @@ impl Version {
pub fn rMQR(version_number: u32) -> Result<VersionRef> {
let version_number = version_number as usize;
if (version_number < 1 || version_number > (RMQR_VERSIONS.len())) {
if version_number < 1 || version_number > (RMQR_VERSIONS.len()) {
Err(Exceptions::ILLEGAL_ARGUMENT)
} else {
Ok(&RMQR_VERSIONS[version_number as usize - 1])
Ok(&RMQR_VERSIONS[version_number - 1])
}
}
@@ -146,7 +146,7 @@ impl Version {
pub fn HasMicroSize(bitMatrix: &BitMatrix) -> bool {
let size = bitMatrix.height();
size == bitMatrix.width() && size >= 11 && size <= 17 && (size % 2) == 1
size == bitMatrix.width() && (11..=17).contains(&size) && (size % 2) == 1
}
pub fn HasRMQRSize(bitMatrix: &BitMatrix) -> bool {
@@ -187,10 +187,8 @@ impl Version {
if width != height
&& width.is_odd()
&& height.is_odd()
&& width >= 27
&& width <= 139
&& height >= 7
&& height <= 17
&& (27..=139).contains(&width)
&& (7..=17).contains(&height)
{
for i in 0..dimsVersionRMQR.len() {
// for (int i = 0; i < Size(dimsVersionRMQR); i++){
@@ -199,6 +197,6 @@ impl Version {
}
}
}
return -1;
-1
}
}