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

fix potential unwrap on none

Browse Source
This commit is contained in:
Henry Schimke
2023-01-06 10:56:00 -06:00
parent 7996f42c64
commit 6d41475786
5 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/string_utils.rs
View File

@@ -83,7 +83,7 @@ impl StringUtils {
"UTF8"
} else if c.name() == encoding::all::ISO_8859_1.name() {
"ISO8859_1"
}else {
} else {
c.name()
}
}

3
src/oned/ean_manufacturer_org_support.rs
View File

@@ -58,8 +58,7 @@ impl EANManufacturerOrgSupport {
return Some(
self.countryIdentifiers
.get(i)
.expect("must have index i or fail")
// .clone(),
.expect("must have index i or fail"), // .clone(),
);
}
}

12
src/oned/rss/rss_14_reader.rs
View File

@@ -19,8 +19,8 @@ use std::collections::HashMap;
use crate::{
common::BitArray,
oned::{one_d_reader, OneDReader},
BarcodeFormat, DecodeHintType, DecodingHintDictionary, Exceptions, RXingResult,
RXingResultMetadataType, RXingResultMetadataValue, Reader, DecodeHintValue, RXingResultPoint,
BarcodeFormat, DecodeHintType, DecodeHintValue, DecodingHintDictionary, Exceptions,
RXingResult, RXingResultMetadataType, RXingResultMetadataValue, RXingResultPoint, Reader,
};
use super::{
@@ -263,14 +263,16 @@ impl RSS14Reader {
let startEnd = self.findFinderPattern(row, right)?;
let pattern = self.parseFoundFinderPattern(row, rowNumber, right, &startEnd)?;
if let Some(DecodeHintValue::NeedResultPointCallback(cb)) = hints.get(&DecodeHintType::NEED_RESULT_POINT_CALLBACK) {
if let Some(DecodeHintValue::NeedResultPointCallback(cb)) =
hints.get(&DecodeHintType::NEED_RESULT_POINT_CALLBACK)
{
let startEnd = pattern.getStartEnd();
let mut center :f32 = (startEnd[0] + startEnd[1] - 1) as f32 / 2.0;
let mut center: f32 = (startEnd[0] + startEnd[1] - 1) as f32 / 2.0;
if right {
// row is actually reversed
center = row.getSize() as f32 - 1.0 - center;
}
cb( &RXingResultPoint::new(center, rowNumber as f32));
cb(&RXingResultPoint::new(center, rowNumber as f32));
}
let outside = self.decodeDataCharacter(row, &pattern, true)?;

4
src/pdf417/decoder/pdf_417_scanning_decoder.rs
View File

@@ -309,6 +309,10 @@ fn getBarcodeMetadata<T: DetectionRXingResultRowIndicatorColumn>(
// return leftBarcodeMetadata;
// }
if leftBarcodeMetadata.is_none() {
return None;
}
if leftBarcodeMetadata.as_ref().unwrap().getColumnCount()
!= rightBarcodeMetadata.as_ref().unwrap().getColumnCount()
&& leftBarcodeMetadata