mirror of
https://github.com/starovoid/rxing.git
synced 2026-07-27 21:02:35 +00:00
fix potential unwrap on none
This commit is contained in:
@@ -78,13 +78,13 @@ impl StringUtils {
|
|||||||
.unwrap()
|
.unwrap()
|
||||||
.name()
|
.name()
|
||||||
{
|
{
|
||||||
"SJIS"
|
"SJIS"
|
||||||
} else if c.name() == encoding::all::UTF_8.name() {
|
} else if c.name() == encoding::all::UTF_8.name() {
|
||||||
"UTF8"
|
"UTF8"
|
||||||
} else if c.name() == encoding::all::ISO_8859_1.name() {
|
} else if c.name() == encoding::all::ISO_8859_1.name() {
|
||||||
"ISO8859_1"
|
"ISO8859_1"
|
||||||
}else {
|
} else {
|
||||||
c.name()
|
c.name()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ impl EANManufacturerOrgSupport {
|
|||||||
// let prefix = Integer.parseInt(productCode.substring(0, 3));
|
// let prefix = Integer.parseInt(productCode.substring(0, 3));
|
||||||
let max = self.ranges.len();
|
let max = self.ranges.len();
|
||||||
for (i, range) in self.ranges.iter().enumerate().take(max) {
|
for (i, range) in self.ranges.iter().enumerate().take(max) {
|
||||||
// for i in 0..max {
|
// for i in 0..max {
|
||||||
// for (int i = 0; i < max; i++) {
|
// for (int i = 0; i < max; i++) {
|
||||||
// let range = self.ranges.get(i).expect("must have index i or fail");
|
// let range = self.ranges.get(i).expect("must have index i or fail");
|
||||||
let start = range[0];
|
let start = range[0];
|
||||||
@@ -58,8 +58,7 @@ impl EANManufacturerOrgSupport {
|
|||||||
return Some(
|
return Some(
|
||||||
self.countryIdentifiers
|
self.countryIdentifiers
|
||||||
.get(i)
|
.get(i)
|
||||||
.expect("must have index i or fail")
|
.expect("must have index i or fail"), // .clone(),
|
||||||
// .clone(),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,10 +98,10 @@ pub trait OneDReader: Reader {
|
|||||||
if attempt == 1 {
|
if attempt == 1 {
|
||||||
// trying again?
|
// trying again?
|
||||||
row.to_mut().reverse(); // reverse the row and continue
|
row.to_mut().reverse(); // reverse the row and continue
|
||||||
// This means we will only ever draw result points *once* in the life of this method
|
// This means we will only ever draw result points *once* in the life of this method
|
||||||
// since we want to avoid drawing the wrong points after flipping the row, and,
|
// since we want to avoid drawing the wrong points after flipping the row, and,
|
||||||
// don't want to clutter with noise from every single row scan -- just the scans
|
// don't want to clutter with noise from every single row scan -- just the scans
|
||||||
// that start on the center line.
|
// that start on the center line.
|
||||||
if hints.contains_key(&DecodeHintType::NEED_RESULT_POINT_CALLBACK) {
|
if hints.contains_key(&DecodeHintType::NEED_RESULT_POINT_CALLBACK) {
|
||||||
// let newHints = HashMap::new();
|
// let newHints = HashMap::new();
|
||||||
// newHints.putAll(hints);
|
// newHints.putAll(hints);
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ use std::collections::HashMap;
|
|||||||
use crate::{
|
use crate::{
|
||||||
common::BitArray,
|
common::BitArray,
|
||||||
oned::{one_d_reader, OneDReader},
|
oned::{one_d_reader, OneDReader},
|
||||||
BarcodeFormat, DecodeHintType, DecodingHintDictionary, Exceptions, RXingResult,
|
BarcodeFormat, DecodeHintType, DecodeHintValue, DecodingHintDictionary, Exceptions,
|
||||||
RXingResultMetadataType, RXingResultMetadataValue, Reader, DecodeHintValue, RXingResultPoint,
|
RXingResult, RXingResultMetadataType, RXingResultMetadataValue, RXingResultPoint, Reader,
|
||||||
};
|
};
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
@@ -263,14 +263,16 @@ impl RSS14Reader {
|
|||||||
let startEnd = self.findFinderPattern(row, right)?;
|
let startEnd = self.findFinderPattern(row, right)?;
|
||||||
let pattern = self.parseFoundFinderPattern(row, rowNumber, right, &startEnd)?;
|
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 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 {
|
if right {
|
||||||
// row is actually reversed
|
// row is actually reversed
|
||||||
center = row.getSize() as f32 - 1.0 - center;
|
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)?;
|
let outside = self.decodeDataCharacter(row, &pattern, true)?;
|
||||||
|
|||||||
@@ -309,6 +309,10 @@ fn getBarcodeMetadata<T: DetectionRXingResultRowIndicatorColumn>(
|
|||||||
// return leftBarcodeMetadata;
|
// return leftBarcodeMetadata;
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
if leftBarcodeMetadata.is_none() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
if leftBarcodeMetadata.as_ref().unwrap().getColumnCount()
|
if leftBarcodeMetadata.as_ref().unwrap().getColumnCount()
|
||||||
!= rightBarcodeMetadata.as_ref().unwrap().getColumnCount()
|
!= rightBarcodeMetadata.as_ref().unwrap().getColumnCount()
|
||||||
&& leftBarcodeMetadata
|
&& leftBarcodeMetadata
|
||||||
|
|||||||
Reference in New Issue
Block a user