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

port: migrate to new cpp Version / FormatInformation

Browse Source
This commit is contained in:
Henry Schimke
2024-01-11 17:28:46 -06:00
parent 4ed49e10ff
commit d93a515f2b
14 changed files with 282 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/qrcode/decoder/version.rs
View File

@@ -18,6 +18,7 @@ use std::fmt;
use crate::{
common::{BitMatrix, Result},
qrcode::cpp_port::Type,
Exceptions,
};
@@ -55,8 +56,7 @@ pub struct Version {
alignmentPatternCenters: Vec<u32>,
ecBlocks: Vec<ECBlocks>,
totalCodewords: u32,
pub(crate) is_micro: bool,
pub(crate) is_model1: bool,
pub(crate) qr_type: Type,
}
impl Version {
fn new(versionNumber: u32, alignmentPatternCenters: Vec<u32>, ecBlocks: [ECBlocks; 4]) -> Self {
@@ -74,8 +74,7 @@ impl Version {
alignmentPatternCenters,
ecBlocks: ecBlocks.to_vec(),
totalCodewords: total,
is_micro: false,
is_model1: false,
qr_type: Type::Model2,
}
}
@@ -94,8 +93,7 @@ impl Version {
alignmentPatternCenters: Vec::default(),
ecBlocks,
totalCodewords: total,
is_micro: true,
is_model1: false,
qr_type: Type::Micro,
}
}
@@ -114,8 +112,7 @@ impl Version {
alignmentPatternCenters: Vec::default(),
ecBlocks,
totalCodewords: total,
is_micro: false,
is_model1: true,
qr_type: Type::Model1,
}
}
@@ -137,7 +134,7 @@ impl Version {
}
pub fn getDimensionForVersion(&self) -> u32 {
Self::DimensionOfVersion(self.versionNumber, self.is_micro)
Self::DimensionOfVersion(self.versionNumber, self.qr_type == Type::Micro)
// 17 + 4 * self.versionNumber
}
@@ -205,7 +202,7 @@ impl Version {
// Top left finder pattern + separator + format
bitMatrix.setRegion(0, 0, 9, 9)?;
if !self.is_micro {
if self.qr_type != Type::Micro {
// Top right finder pattern + separator + format
bitMatrix.setRegion(dimension - 8, 0, 8, 9)?;
// Bottom left finder pattern + separator + format