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

cargo fix

Browse Source
This commit is contained in:
Henry
2023-04-28 19:15:25 -05:00
parent 9a8df1931b
commit 2afc6be3dc
22 changed files with 157 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/qrcode/cpp_port/bitmatrix_parser.rs
View File

@@ -23,7 +23,7 @@ pub fn getBit(bitMatrix: &BitMatrix, x: u32, y: u32, mirrored: Option<bool>) ->
pub fn hasValidDimension(bitMatrix: &BitMatrix, isMicro: bool) -> bool {
let dimension = bitMatrix.height();
if (isMicro) {
if isMicro {
dimension >= 11 && dimension <= 17 && (dimension % 2) == 1
} else {
dimension >= 21 && dimension <= 177 && (dimension % 4) == 1
@@ -35,7 +35,7 @@ pub fn ReadVersion(bitMatrix: &BitMatrix) -> Result<VersionRef> {
let mut version = Version::FromDimension(dimension)?;
if (version.getVersionNumber() < 7) {
if version.getVersionNumber() < 7 {
return Ok(version);
}
@@ -52,7 +52,7 @@ pub fn ReadVersion(bitMatrix: &BitMatrix) -> Result<VersionRef> {
}
version = Version::DecodeVersionInformation(versionBits, 0)?; // THIS MIGHT BE WRONG todo!()
if (version.getDimensionForVersion() == dimension) {
if version.getDimensionForVersion() == dimension {
return Ok(version);
}
}
@@ -61,11 +61,11 @@ pub fn ReadVersion(bitMatrix: &BitMatrix) -> Result<VersionRef> {
}
pub fn ReadFormatInformation(bitMatrix: &BitMatrix, isMicro: bool) -> Result<FormatInformation> {
if (!hasValidDimension(bitMatrix, isMicro)) {
if !hasValidDimension(bitMatrix, isMicro) {
return Err(Exceptions::FORMAT);
}
if (isMicro) {
if isMicro {
// Read top-left format info bits
let mut formatInfoBits = 0;
for x in 1..9 {
@@ -134,7 +134,7 @@ pub fn ReadQRCodewords(
while x > 0 {
// for (int x = dimension - 1; x > 0; x -= 2) {
// Skip whole column with vertical timing pattern.
if (x == 6) {
if x == 6 {
x -= 1;
}
// Read alternatingly from bottom to top then top to bottom
@@ -145,7 +145,7 @@ pub fn ReadQRCodewords(
// for (int col = 0; col < 2; col++) {
let xx = (x - col) as u32;
// Ignore bits covered by the function pattern
if (!functionPattern.get(xx, y)) {
if !functionPattern.get(xx, y) {
// Read a bit
AppendBit(
&mut currentByte,
@@ -154,7 +154,7 @@ pub fn ReadQRCodewords(
);
// If we've made a whole byte, save it off
bitsRead += 1;
if (bitsRead % 8 == 0) {
if bitsRead % 8 == 0 {
result.push(std::mem::take(&mut currentByte));
}
}
@@ -164,7 +164,7 @@ pub fn ReadQRCodewords(
x -= 2;
}
if ((result.len()) != version.getTotalCodewords() as usize) {
if (result.len()) != version.getTotalCodewords() as usize {
return Err(Exceptions::FORMAT);
}
@@ -185,11 +185,11 @@ pub fn ReadMQRCodewords(
let d4mBlockIndex = if version.getVersionNumber() == 1 {
3
} else {
(if formatInfo.error_correction_level == ErrorCorrectionLevel::L {
if formatInfo.error_correction_level == ErrorCorrectionLevel::L {
11
} else {
9
})
}
};
let mut result = Vec::new();
@@ -210,7 +210,7 @@ pub fn ReadMQRCodewords(
// for (int col = 0; col < 2; col++) {
let xx = x - col;
// Ignore bits covered by the function pattern
if (!functionPattern.get(xx, y)) {
if !functionPattern.get(xx, y) {
// Read a bit
AppendBit(
&mut currentByte,
@@ -219,8 +219,8 @@ pub fn ReadMQRCodewords(
);
bitsRead += 1;
// If we've made a whole byte, save it off; save early if 2x2 data block.
if (bitsRead == 8
|| (bitsRead == 4 && hasD4mBlock && (result.len()) == d4mBlockIndex - 1))
if bitsRead == 8
|| (bitsRead == 4 && hasD4mBlock && (result.len()) == d4mBlockIndex - 1)
{
result.push(std::mem::take(&mut currentByte));
bitsRead = 0;
@@ -232,7 +232,7 @@ pub fn ReadMQRCodewords(
x -= 2;
}
if ((result.len()) != version.getTotalCodewords() as usize) {
if (result.len()) != version.getTotalCodewords() as usize {
return Err(Exceptions::FORMAT);
}
@@ -244,7 +244,7 @@ pub fn ReadCodewords(
version: VersionRef,
formatInfo: &FormatInformation,
) -> Result<Vec<u8>> {
if (!hasValidDimension(bitMatrix, version.isMicroQRCode())) {
if !hasValidDimension(bitMatrix, version.isMicroQRCode()) {
return Err(Exceptions::FORMAT);
}

6
src/qrcode/cpp_port/data_mask.rs
View File

@@ -18,8 +18,8 @@ use crate::Exceptions;
pub fn GetDataMaskBit(maskIndex: u32, x: u32, y: u32, isMicro: Option<bool>) -> Result<bool> {
let isMicro = isMicro.unwrap_or(false);
let mut maskIndex = maskIndex;
if (isMicro) {
if (maskIndex < 0 || maskIndex >= 4) {
if isMicro {
if maskIndex < 0 || maskIndex >= 4 {
return Err(Exceptions::illegal_argument_with(
"QRCode maskIndex out of range",
));
@@ -27,7 +27,7 @@ pub fn GetDataMaskBit(maskIndex: u32, x: u32, y: u32, isMicro: Option<bool>) ->
maskIndex = [1, 4, 6, 7][maskIndex as usize]; // map from MQR to QR indices
}
match (maskIndex) {
match maskIndex {
0 => return Ok((y + x) % 2 == 0),
1 => return Ok(y % 2 == 0),
2 => return Ok(x % 3 == 0),

40
src/qrcode/cpp_port/decoder.rs
View File

@@ -9,7 +9,7 @@ use crate::common::reedsolomon::{
get_predefined_genericgf, PredefinedGenericGF, ReedSolomonDecoder,
};
use crate::common::{
AIFlag, BitMatrix, BitSource, CharacterSet, DecoderRXingResult, ECIStringBuilder, Eci, Result,
AIFlag, BitMatrix, BitSource, CharacterSet, ECIStringBuilder, Eci, Result,
SymbologyIdentifier,
};
use crate::qrcode::cpp_port::bitmatrix_parser::{
@@ -73,11 +73,11 @@ pub fn DecodeHanziSegment(
result.switch_encoding(CharacterSet::GB18030, false);
result.reserve(2 * count as usize);
while (count > 0) {
while count > 0 {
// Each 13 bits encodes a 2-byte character
let twoBytes = bits.readBits(13)?;
let mut assembledTwoBytes = ((twoBytes / 0x060) << 8) | (twoBytes % 0x060);
if (assembledTwoBytes < 0x00A00) {
if assembledTwoBytes < 0x00A00 {
// In the 0xA1A1 to 0xAAFE range
assembledTwoBytes += 0x0A1A1;
} else {
@@ -102,11 +102,11 @@ pub fn DecodeKanjiSegment(
result.switch_encoding(CharacterSet::Shift_JIS, false);
result.reserve(2 * count as usize);
while (count > 0) {
while count > 0 {
// Each 13 bits encodes a 2-byte character
let twoBytes = bits.readBits(13)?;
let mut assembledTwoBytes = ((twoBytes / 0x0C0) << 8) | (twoBytes % 0x0C0);
if (assembledTwoBytes < 0x01F00) {
if assembledTwoBytes < 0x01F00 {
// In the 0x8140 to 0x9FFC range
assembledTwoBytes += 0x08140;
} else {
@@ -146,7 +146,7 @@ pub fn ToAlphaNumericChar(value: u32) -> Result<char> {
' ', '$', '%', '*', '+', '-', '.', '/', ':',
];
if (value < 0 || value >= (ALPHANUMERIC_CHARS.len())) {
if value < 0 || value >= (ALPHANUMERIC_CHARS.len()) {
return Err(Exceptions::index_out_of_bounds_with(
"oAlphaNumericChar: out of range",
));
@@ -171,27 +171,27 @@ pub fn DecodeAlphanumericSegment(
buffer.push(ToAlphaNumericChar(nextTwoCharsBits % 45)?);
count -= 2;
}
if (count == 1) {
if count == 1 {
// special case: one character left
buffer.push(ToAlphaNumericChar(bits.readBits(6)?)?);
}
// See section 6.4.8.1, 6.4.8.2
if (result.symbology.aiFlag != AIFlag::None) {
if result.symbology.aiFlag != AIFlag::None {
// We need to massage the result a bit if in an FNC1 mode:
for i in 0..buffer.len() {
// for (size_t i = 0; i < buffer.length(); i++) {
if (buffer
if buffer
.chars()
.nth(i)
.ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?
== '%')
== '%'
{
if (i < buffer.len() - 1
if i < buffer.len() - 1
&& buffer
.chars()
.nth(i + 1)
.ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?
== '%')
== '%'
{
// %% is rendered as %
buffer.remove(i + 1);
@@ -221,7 +221,7 @@ pub fn DecodeNumericSegment(
result.switch_encoding(CharacterSet::ISO8859_1, false);
result.reserve(count as usize);
while (count > 0) {
while count > 0 {
let n = std::cmp::min(count, 3);
let nDigits = bits.readBits(1 + 3 * n as usize)?; // read 4, 7 or 10 bits into 1, 2 or 3 digits
result.append_string(&crate::common::cpp_essentials::util::ToString(
@@ -236,16 +236,16 @@ pub fn DecodeNumericSegment(
pub fn ParseECIValue(bits: &mut BitSource) -> Result<Eci> {
let firstByte = bits.readBits(8)?;
if ((firstByte & 0x80) == 0) {
if (firstByte & 0x80) == 0 {
// just one byte
return Ok(Eci::from(firstByte & 0x7F));
}
if ((firstByte & 0xC0) == 0x80) {
if (firstByte & 0xC0) == 0x80 {
// two bytes
let secondByte = bits.readBits(8)?;
return Ok(Eci::from(((firstByte & 0x3F) << 8) | secondByte));
}
if ((firstByte & 0xE0) == 0xC0) {
if (firstByte & 0xE0) == 0xC0 {
// three bytes
let secondThirdBytes = bits.readBits(16)?;
return Ok(Eci::from(((firstByte & 0x1F) << 16) | secondThirdBytes));
@@ -332,7 +332,7 @@ pub fn DecodeBitStream(
{
result +=
crate::common::cpp_essentials::util::ToString(appInd as usize, 2)?;
} else if ((appInd >= 165 && appInd <= 190) || (appInd >= 197 && appInd <= 222))
} else if (appInd >= 165 && appInd <= 190) || (appInd >= 197 && appInd <= 222)
// "A-Za-z"
{
result += (appInd - 100) as u8;
@@ -357,7 +357,7 @@ pub fn DecodeBitStream(
// First handle Hanzi mode which does not start with character count
// chinese mode contains a sub set indicator right after mode indicator
let subset = bits.readBits(4)?;
if (subset != 1)
if subset != 1
// GB2312_SUBSET is the only supported one right now
{
return Err(Exceptions::format_with("Unsupported HANZI subset"));
@@ -404,14 +404,14 @@ pub fn Decode(bits: &BitMatrix) -> Result<DecoderResult<bool>> {
// Read codewords
let codewords = ReadCodewords(bits, &version, &formatInfo)?;
if (codewords.is_empty()) {
if codewords.is_empty() {
return Err(Exceptions::format_with("Failed to read codewords"));
}
// Separate into data blocks
let dataBlocks: Vec<DataBlock> =
DataBlock::getDataBlocks(&codewords, &version, formatInfo.error_correction_level)?;
if (dataBlocks.is_empty()) {
if dataBlocks.is_empty() {
return Err(Exceptions::format_with("Failed to get data blocks"));
}

119
src/qrcode/cpp_port/detector.rs
View File

@@ -4,8 +4,7 @@ use crate::{
CenterOfRing, DMRegressionLine, FindConcentricPatternCorners, FindLeftGuardBy, Matrix,
},
DefaultGridSampler, GridSampler, Result, SamplerControl,
},
dimension, point_g, point_i,
}, point_i,
qrcode::{
decoder::{FormatInformation, Version, VersionRef},
detector::QRCodeDetectorResult,
@@ -17,8 +16,8 @@ use multimap::MultiMap;
use crate::{
common::{
cpp_essentials::{
BitMatrixCursorTrait, ConcentricPattern, Direction, EdgeTracer, FindLeftGuard,
FixedPattern, GetPatternRow, GetPatternRowTP, IsPattern, LocateConcentricPattern,
BitMatrixCursorTrait, ConcentricPattern, Direction, EdgeTracer,
FixedPattern, GetPatternRowTP, IsPattern, LocateConcentricPattern,
PatternRow, PatternType, PatternView, ReadSymmetricPattern, RegressionLine,
RegressionLineTrait,
},
@@ -48,8 +47,8 @@ fn FindPattern<'a>(view: PatternView<'a>) -> Result<PatternView<'a>> {
LEN,
|view: &PatternView, spaceInPixel: Option<f32>| {
// perform a fast plausability test for 1:1:3:1:1 pattern
if (view[2] < 2 as PatternType * std::cmp::max(view[0], view[4])
|| view[2] < std::cmp::max(view[1], view[3]))
if view[2] < 2 as PatternType * std::cmp::max(view[0], view[4])
|| view[2] < std::cmp::max(view[1], view[3])
{
return false;
}
@@ -70,7 +69,7 @@ pub fn FindFinderPatterns(image: &BitMatrix, tryHarder: bool) -> FinderPatterns
// QR versions regardless of how dense they are.
let height = image.height();
let mut skip = (3 * height) / (4 * MAX_MODULES_FAST);
if (skip < MIN_SKIP || tryHarder) {
if skip < MIN_SKIP || tryHarder {
skip = MIN_SKIP;
}
@@ -113,7 +112,7 @@ pub fn FindFinderPatterns(image: &BitMatrix, tryHarder: bool) -> FinderPatterns
next.iter().sum::<u16>() as i32 * 3,
); // 3 for very skewed samples
// Reduce(next) * 3); // 3 for very skewed samples
if (pattern.is_some()) {
if pattern.is_some() {
// log(*pattern, 3);
// assert!(image.get_point(pattern.as_ref().unwrap().p));
res.push(pattern.unwrap());
@@ -146,7 +145,7 @@ pub fn GenerateFinderPatternSets(patterns: &mut FinderPatterns) -> FinderPattern
// the camera projection on slanted symbols. The fact that the size of the finder pattern is proportional to the
// distance from the camera is used here. This approximation only works if a < b < 2*a (see below).
// Test image: fix-finderpattern-order.jpg
ConcentricPattern::dot((a - b), (a - b)) as f64
ConcentricPattern::dot(a - b, a - b) as f64
* (((b).size as f64) / ((a).size as f64)).powi(2) //std::pow(double(b.size) / a.size, 2)
};
@@ -170,7 +169,7 @@ pub fn GenerateFinderPatternSets(patterns: &mut FinderPatterns) -> FinderPattern
let mut c = &patterns[k];
// if the pattern sizes are too different to be part of the same symbol, skip this
// and the rest of the innermost loop (sorted list)
if (c.size > a.size * 2) {
if c.size > a.size * 2 {
break;
}
@@ -181,20 +180,20 @@ pub fn GenerateFinderPatternSets(patterns: &mut FinderPatterns) -> FinderPattern
let mut distBC2 = squaredDistance(*b, *c);
let mut distAC2 = squaredDistance(*a, *c);
if (distBC2 >= distAB2 && distBC2 >= distAC2) {
if distBC2 >= distAB2 && distBC2 >= distAC2 {
std::mem::swap(&mut a, &mut b);
std::mem::swap(&mut distBC2, &mut distAC2);
} else if (distAB2 >= distAC2 && distAB2 >= distBC2) {
} else if distAB2 >= distAC2 && distAB2 >= distBC2 {
std::mem::swap(&mut b, &mut c);
std::mem::swap(&mut distAB2, &mut distAC2);
}
let distAB = (distAB2.sqrt());
let distAB = distAB2.sqrt();
let distBC = (distBC2).sqrt();
// Make sure distAB and distBC don't differ more than reasonable
// TODO: make sure the constant 2 is not to conservative for reasonably tilted symbols
if (distAB > 2.0 * distBC || distBC > 2.0 * distAB) {
if distAB > 2.0 * distBC || distBC > 2.0 * distAB {
continue;
}
@@ -202,7 +201,7 @@ pub fn GenerateFinderPatternSets(patterns: &mut FinderPatterns) -> FinderPattern
let moduleCount = (distAB + distBC)
/ (2.0 * (a.size + b.size + c.size) as f64 / (3.0 * 7.0))
+ 7.0;
if (moduleCount < 21.0 * 0.9 || moduleCount > 177.0 * 1.5)
if moduleCount < 21.0 * 0.9 || moduleCount > 177.0 * 1.5
// moduleCount may be overestimated, see above
{
continue;
@@ -210,7 +209,7 @@ pub fn GenerateFinderPatternSets(patterns: &mut FinderPatterns) -> FinderPattern
// Make sure the angle between AB and BC does not deviate from 90° by more than 45°
let cosAB_BC = (distAB2 + distBC2 - distAC2) / (2.0 * distAB * distBC);
if ((cosAB_BC.is_nan()) || cosAB_BC > cosUpper || cosAB_BC < cosLower) {
if (cosAB_BC.is_nan()) || cosAB_BC > cosUpper || cosAB_BC < cosLower {
continue;
}
@@ -219,12 +218,12 @@ pub fn GenerateFinderPatternSets(patterns: &mut FinderPatterns) -> FinderPattern
// we need to check both two equal sides separately.
// The value of |c^2 - 2 * b^2| + |c^2 - 2 * a^2| increases as dissimilarity
// from isosceles right triangle.
let d: f64 = ((distAC2 - 2.0 * distAB2).abs() + (distAC2 - 2.0 * distBC2).abs());
let d: f64 = (distAC2 - 2.0 * distAB2).abs() + (distAC2 - 2.0 * distBC2).abs();
// Use cross product to figure out whether A and C are correct or flipped.
// This asks whether BC x BA has a positive z component, which is the arrangement
// we want for A, B, C. If it's negative then swap A and C.
if (ConcentricPattern::cross(*c - *b, *a - *b) < 0.0) {
if ConcentricPattern::cross(*c - *b, *a - *b) < 0.0 {
std::mem::swap(&mut a, &mut c);
}
@@ -276,13 +275,13 @@ pub fn EstimateModuleSize(image: &BitMatrix, a: ConcentricPattern, b: Concentric
let pattern = pattern.unwrap();
if (!(IsPattern::<E2E, 5, 7, false>(
if !(IsPattern::<E2E, 5, 7, false>(
&PatternView::new(&PatternRow::new(pattern.to_vec())),
&PATTERN,
None,
0.0,
0.0,
) != 0.0))
) != 0.0)
{
return -1.0;
}
@@ -316,13 +315,13 @@ pub fn EstimateDimension(
let ms_a = EstimateModuleSize(image, a, b);
let ms_b = EstimateModuleSize(image, b, a);
if (ms_a < 0.0 || ms_b < 0.0) {
if ms_a < 0.0 || ms_b < 0.0 {
return DimensionEstimate::default();
}
let moduleSize = (ms_a + ms_b) / 2.0;
let dimension = ((ConcentricPattern::distance(a, b) as f64 / moduleSize).round() as i32 + 7);
let dimension = (ConcentricPattern::distance(a, b) as f64 / moduleSize).round() as i32 + 7;
let error = 1 - (dimension % 4);
DimensionEstimate {
@@ -340,17 +339,17 @@ pub fn TraceLine(image: &BitMatrix, p: Point, d: Point, edge: i32) -> impl Regre
// collect points inside the black line -> backup on 3rd edge
cur.stepToEdge(Some(edge), Some(0), Some(edge == 3));
if (edge == 3) {
if edge == 3 {
cur.turnBack();
}
let mut curI = EdgeTracer::new(image, (cur.p), (Point::mainDirection(cur.d())));
let mut curI = EdgeTracer::new(image, cur.p, Point::mainDirection(cur.d()));
// make sure curI positioned such that the white->black edge is directly behind
// Test image: fix-traceline.jpg
while (!bool::from(curI.edgeAtBack())) {
if (curI.edgeAtLeft().into()) {
while !bool::from(curI.edgeAtBack()) {
if curI.edgeAtLeft().into() {
curI.turnRight();
} else if (curI.edgeAtRight().into()) {
} else if curI.edgeAtRight().into() {
curI.turnLeft();
} else {
curI.step(Some(-1.0));
@@ -498,14 +497,14 @@ pub fn SampleQR(image: &BitMatrix, fp: &FinderPatternSet) -> Result<QRCodeDetect
let top = EstimateDimension(image, fp.tl, fp.tr);
let left = EstimateDimension(image, fp.tl, fp.bl);
if (!(top.dim != 0) && !(left.dim != 0)) {
if !(top.dim != 0) && !(left.dim != 0) {
return Err(Exceptions::NOT_FOUND);
}
let best = if top.err == left.err {
(if top.dim > left.dim { top } else { left })
if top.dim > left.dim { top } else { left }
} else {
(if top.err < left.err { top } else { left })
if top.err < left.err { top } else { left }
};
let mut dimension = best.dim;
let moduleSize = (best.ms + 1.0) as i32;
@@ -527,14 +526,14 @@ pub fn SampleQR(image: &BitMatrix, fp: &FinderPatternSet) -> Result<QRCodeDetect
let tr2 = TraceLine(image, fp.tr.p, fp.tl.p, 2);
let tr3 = TraceLine(image, fp.tr.p, fp.tl.p, 3);
if (bl2.isValid() && tr2.isValid() && bl3.isValid() && tr3.isValid()) {
if bl2.isValid() && tr2.isValid() && bl3.isValid() && tr3.isValid() {
// intersect both outer and inner line pairs and take the center point between the two intersection points
let brInter = (DMRegressionLine::intersect(&bl2, &tr2).ok_or(Exceptions::NOT_FOUND)?
+ DMRegressionLine::intersect(&bl3, &tr3).ok_or(Exceptions::NOT_FOUND)?)
/ 2.0;
// log(brInter, 3);
if (dimension > 21) {
if dimension > 21 {
if let Some(brCP) = LocateAlignmentPattern(image, moduleSize, brInter) {
br = brCP.into();
}
@@ -542,16 +541,16 @@ pub fn SampleQR(image: &BitMatrix, fp: &FinderPatternSet) -> Result<QRCodeDetect
// if the symbol is tilted or the resolution of the RegressionLines is sufficient, use their intersection
// as the best estimate (see discussion in #199 and test image estimate-tilt.jpg )
if (!image.is_in(br.p)
if !image.is_in(br.p)
&& (EstimateTilt(fp) > 1.1
|| (bl2.isHighRes() && bl3.isHighRes() && tr2.isHighRes() && tr3.isHighRes())))
|| (bl2.isHighRes() && bl3.isHighRes() && tr2.isHighRes() && tr3.isHighRes()))
{
br = brInter.into();
}
}
// otherwise the simple estimation used by upstream is used as a best guess fallback
if (!image.is_in(br.p)) {
if !image.is_in(br.p) {
br = fp.tr - fp.tl + fp.bl;
brOffset = point_i(0, 0);
}
@@ -563,17 +562,17 @@ pub fn SampleQR(image: &BitMatrix, fp: &FinderPatternSet) -> Result<QRCodeDetect
Quadrilateral::from([fp.tl.p, fp.tr.p, br.p, fp.bl.p]),
)?;
if (dimension >= Version::DimensionOfVersion(7, false) as i32) {
if dimension >= Version::DimensionOfVersion(7, false) as i32 {
let version = ReadVersion(image, dimension as u32, mod2Pix.clone());
// if the version bits are garbage -> discard the detection
if (!version.is_ok()
|| (version.as_ref().unwrap().getDimensionForVersion() as i32 - dimension).abs() > 8)
if !version.is_ok()
|| (version.as_ref().unwrap().getDimensionForVersion() as i32 - dimension).abs() > 8
{
/*return DetectorResult();*/
return Err(Exceptions::NOT_FOUND);
}
if (version.as_ref().unwrap().getDimensionForVersion() as i32 != dimension) {
if version.as_ref().unwrap().getDimensionForVersion() as i32 != dimension {
// printf("update dimension: %d -> %d\n", dimension, version.dimension());
dimension = version.as_ref().unwrap().getDimensionForVersion() as i32;
mod2Pix = Mod2Pix(
@@ -617,7 +616,7 @@ pub fn SampleQR(image: &BitMatrix, fp: &FinderPatternSet) -> Result<QRCodeDetect
// for (int y = 0; y <= N; ++y)
for x in 0..=N {
// for (int x = 0; x <= N; ++x) {
if (apP.get(x, y).is_some()) {
if apP.get(x, y).is_some() {
continue;
}
@@ -640,7 +639,7 @@ pub fn SampleQR(image: &BitMatrix, fp: &FinderPatternSet) -> Result<QRCodeDetect
// for (int y = 0; y <= N; ++y) {
for x in 0..=N {
// for (int x = 0; x <= N; ++x) {
if (apP.get(x, y).is_some()) {
if apP.get(x, y).is_some() {
continue;
}
@@ -650,7 +649,7 @@ pub fn SampleQR(image: &BitMatrix, fp: &FinderPatternSet) -> Result<QRCodeDetect
let mut i = 2;
while i < 2 * N + 2 && hori.len() < 2 {
let xi = x as isize + i as isize / 2 * (if i % 2 != 0 { 1 } else { -1 });
if (0 <= xi && xi <= N as isize && apP.get(xi as usize, y).is_some()) {
if 0 <= xi && xi <= N as isize && apP.get(xi as usize, y).is_some() {
hori.push(
apP.get(xi as usize, y)
.ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?,
@@ -666,7 +665,7 @@ pub fn SampleQR(image: &BitMatrix, fp: &FinderPatternSet) -> Result<QRCodeDetect
let mut i = 2;
while i < 2 * N + 2 && verti.len() < 2 {
let yi = y as isize + i as isize / 2 * (if i % 2 != 0 { 1 } else { -1 });
if (0 <= yi && yi <= N as isize && apP.get(x, yi as usize).is_some()) {
if 0 <= yi && yi <= N as isize && apP.get(x, yi as usize).is_some() {
verti.push(
apP.get(x, yi as usize)
.ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?,
@@ -681,7 +680,7 @@ pub fn SampleQR(image: &BitMatrix, fp: &FinderPatternSet) -> Result<QRCodeDetect
// }
// if we found 2 each, intersect the two lines that are formed by connecting the point pairs
if ((hori.len()) == 2 && (verti.len()) == 2) {
if (hori.len()) == 2 && (verti.len()) == 2 {
let guessed = RegressionLine::intersect(
&DMRegressionLine::new(hori[0], hori[1]),
&DMRegressionLine::new(verti[0], verti[1]),
@@ -719,7 +718,7 @@ pub fn SampleQR(image: &BitMatrix, fp: &FinderPatternSet) -> Result<QRCodeDetect
// for (int y = 0; y <= N; ++y) {
for x in 0..=N {
// for (int x = 0; x <= N; ++x) {
if (apP.get(x, y).is_some()) {
if apP.get(x, y).is_some() {
continue;
}
@@ -802,7 +801,7 @@ pub fn DetectPureQR(image: &BitMatrix) -> Result<QRCodeDetectorResult> {
let (found, left, top, width, height) = image.findBoundingBox(0, 0, 0, 0, MIN_MODULES);
if (!found || (width as i32 - height as i32).abs() > 1) {
if !found || (width as i32 - height as i32).abs() > 1 {
return Err(Exceptions::NOT_FOUND);
}
let right = left + width - 1;
@@ -825,7 +824,7 @@ pub fn DetectPureQR(image: &BitMatrix) -> Result<QRCodeDetectorResult> {
// diagonal = BitMatrixCursorI(image, p, d).readPatternFromBlack<Pattern>(1, width / 3 + 1);
let diag_hld = diagonal.to_vec().into();
let view = PatternView::new(&diag_hld);
if (!(IsPattern::<E2E, 5, 7, false>(&view, &PATTERN, None, 0.0, 0.0) != 0.0)) {
if !(IsPattern::<E2E, 5, 7, false>(&view, &PATTERN, None, 0.0, 0.0) != 0.0) {
return Err(Exceptions::NOT_FOUND);
}
}
@@ -845,12 +844,12 @@ pub fn DetectPureQR(image: &BitMatrix) -> Result<QRCodeDetectorResult> {
.dim;
let moduleSize: f32 = ((width) as f32) / dimension as f32;
if (dimension < MIN_MODULES as i32
if dimension < MIN_MODULES as i32
|| dimension > MAX_MODULES as i32
|| !image.is_in(point(
left as f32 + moduleSize / 2.0 + (dimension - 1) as f32 * moduleSize as f32,
top as f32 + moduleSize / 2.0 + (dimension - 1) as f32 * moduleSize,
)))
))
{
return Err(Exceptions::NOT_FOUND);
}
@@ -893,7 +892,7 @@ pub fn DetectPureMQR(image: &BitMatrix) -> Result<QRCodeDetectorResult> {
let (found, left, top, width, height) = image.findBoundingBox(0, 0, 0, 0, MIN_MODULES);
// int left, top, width, height;
if (!found || (width as i32 - height as i32).abs() > 1) {
if !found || (width as i32 - height as i32).abs() > 1 {
return Err(Exceptions::NOT_FOUND);
}
let right = left + width - 1;
@@ -905,20 +904,20 @@ pub fn DetectPureMQR(image: &BitMatrix) -> Result<QRCodeDetectorResult> {
.ok_or(Exceptions::ILLEGAL_STATE)?;
let diag_hld = diagonal.to_vec().into();
let view = PatternView::new(&diag_hld);
if (!(IsPattern::<E2E, 5, 7, false>(&view, &PATTERN, None, 0.0, 0.0) != 0.0)) {
if !(IsPattern::<E2E, 5, 7, false>(&view, &PATTERN, None, 0.0, 0.0) != 0.0) {
return Err(Exceptions::NOT_FOUND);
}
let fpWidth = (diagonal.into_iter().sum::<u16>());
let fpWidth = diagonal.into_iter().sum::<u16>();
let moduleSize: f32 = (fpWidth as f32) / 7.0;
let dimension = (width as f32 / moduleSize).floor() as u32;
if (dimension < MIN_MODULES
if dimension < MIN_MODULES
|| dimension > MAX_MODULES
|| !image.is_in(point(
left as f32 + moduleSize as f32 / 2.0 + (dimension - 1) as f32 * moduleSize,
top as f32 + moduleSize as f32 / 2.0 + (dimension - 1) as f32 * moduleSize,
)))
))
{
return Err(Exceptions::NOT_FOUND);
}
@@ -1002,7 +1001,7 @@ pub fn SampleMQR(image: &BitMatrix, fp: ConcentricPattern) -> Result<QRCodeDetec
};
// check that we see both innermost timing pattern modules
if (!check(0, true) || !check(8, false) || !check(16, true)) {
if !check(0, true) || !check(8, false) || !check(16, true) {
continue;
}
@@ -1017,13 +1016,13 @@ pub fn SampleMQR(image: &BitMatrix, fp: ConcentricPattern) -> Result<QRCodeDetec
}
let fi = FormatInformation::DecodeMQR(formatInfoBits as u32);
if (fi.hammingDistance < bestFI.hammingDistance) {
if fi.hammingDistance < bestFI.hammingDistance {
bestFI = fi;
bestPT = mod2Pix;
}
}
if (!bestFI.isValid()) {
if !bestFI.isValid() {
return Err(Exceptions::NOT_FOUND);
}
@@ -1036,10 +1035,10 @@ pub fn SampleMQR(image: &BitMatrix, fp: ConcentricPattern) -> Result<QRCodeDetec
// for (int i = 0; i < dim; ++i) {
let px = bestPT.transform_point(Point::centered(point_i(i, dim)));
let py = bestPT.transform_point(Point::centered(point_i(dim, i)));
blackPixels += u32::from((image.is_in(px) && image.get_point(px)))
+ u32::from((image.is_in(py) && image.get_point(py)));
blackPixels += u32::from(image.is_in(px) && image.get_point(px))
+ u32::from(image.is_in(py) && image.get_point(py));
}
if (blackPixels > 2 * dim / 3) {
if blackPixels > 2 * dim / 3 {
return Err(Exceptions::NOT_FOUND);
}

24
src/qrcode/cpp_port/qr_cpp_reader.rs
View File

@@ -118,9 +118,9 @@
// } // namespace ZXing::QRCode
use crate::{
common::{cpp_essentials::ConcentricPattern, DetectorRXingResult, HybridBinarizer},
common::{cpp_essentials::ConcentricPattern, DetectorRXingResult},
multi::MultipleBarcodeReader,
BarcodeFormat, BinaryBitmap, DecodeHintType, DecodeHintValue, DecodingHintDictionary,
BarcodeFormat, DecodeHintType, DecodeHintValue, DecodingHintDictionary,
Exceptions, RXingResult, Reader,
};
@@ -132,7 +132,7 @@ use super::{
},
};
use crate::qrcode::detector::QRCodeDetectorResult as DetectorResult;
#[derive(Default)]
pub struct QrReader;
@@ -294,9 +294,9 @@ impl QrReader {
let allFPSets = GenerateFinderPatternSets(&mut allFPs);
for fpSet in allFPSets {
// for (const auto& fpSet : allFPSets) {
if (usedFPs.contains(&fpSet.bl)
if usedFPs.contains(&fpSet.bl)
|| usedFPs.contains(&fpSet.tl)
|| usedFPs.contains(&fpSet.tr))
|| usedFPs.contains(&fpSet.tr)
{
continue;
}
@@ -309,13 +309,13 @@ impl QrReader {
let decoderResult = Decode(detectorResult.getBits());
let position = detectorResult.getPoints();
if let Ok(decoderResult) = decoderResult {
if (decoderResult.isValid()) {
if decoderResult.isValid() {
usedFPs.push(fpSet.bl);
usedFPs.push(fpSet.tl);
usedFPs.push(fpSet.tr);
}
if (decoderResult.isValid()) {
if decoderResult.isValid() {
// results.push(RXingResult::new(
// &decoderResult.content().to_string(),
// decoderResult.content().bytes().to_vec(),
@@ -329,7 +329,7 @@ impl QrReader {
));
// results.emplace_back(std::move(decoderResult), std::move(position), BarcodeFormat::QR_CODE);
if (maxSymbols != 0 && (results.len() as u32) == maxSymbols) {
if maxSymbols != 0 && (results.len() as u32) == maxSymbols {
break;
}
}
@@ -337,11 +337,11 @@ impl QrReader {
}
}
}
if (check_mqr && !(maxSymbols != 0 && (results.len() as u32) == maxSymbols)) {
if check_mqr && !(maxSymbols != 0 && (results.len() as u32) == maxSymbols) {
// if (_hints.hasFormat(BarcodeFormat::MicroQRCode) && !(maxSymbols && Size(results) == maxSymbols)) {
for fp in allFPs {
// for (const auto& fp : allFPs) {
if (usedFPs.contains(&fp)) {
if usedFPs.contains(&fp) {
continue;
}
@@ -351,7 +351,7 @@ impl QrReader {
let decoderResult = Decode(detectorResult.getBits());
let position = detectorResult.getPoints();
if let Ok(decoderResult) = decoderResult {
if (decoderResult.isValid()) {
if decoderResult.isValid() {
results.push(RXingResult::with_decoder_result(
decoderResult,
position,
@@ -365,7 +365,7 @@ impl QrReader {
// ));
// results.emplace_back(std::move(decoderResult), std::move(position), BarcodeFormat::MICRO_QR_CODE);
if (maxSymbols != 0 && (results.len() as u32) == maxSymbols) {
if maxSymbols != 0 && (results.len() as u32) == maxSymbols {
break;
}
}

4
src/qrcode/cpp_port/test/QRDecodedBitStreamParserTest.rs
View File

@@ -23,10 +23,10 @@
// using namespace ZXing;
// using namespace ZXing::QRCode;
use crate::common::Result;
use crate::{
common::{cpp_essentials::DecoderResult, BitArray},
common::{BitArray},
qrcode::{
cpp_port::decoder::DecodeBitStream,
decoder::{ErrorCorrectionLevel, Version},

2
src/qrcode/cpp_port/test/QRVersionTest.rs
View File

@@ -12,7 +12,7 @@ use crate::{
fn CheckVersion(version: VersionRef, number: u32, dimension: u32) {
// assert_ne!(version, nullptr);
assert_eq!(number, version.getVersionNumber());
if (number > 1 && !version.isMicroQRCode()) {
if number > 1 && !version.isMicroQRCode() {
assert!(!version.getAlignmentPatternCenters().is_empty());
}
assert_eq!(dimension, version.getDimensionForVersion());