From 6d4147578698a015fcfd314465c2667c289692fe Mon Sep 17 00:00:00 2001
From: Henry Schimke <henry@azule.info>
Date: Fri, 6 Jan 2023 10:56:00 -0600
Subject: [PATCH] fix potential unwrap on none

---
 src/common/string_utils.rs                     | 10 +++++-----
 src/oned/ean_manufacturer_org_support.rs       |  5 ++---
 src/oned/one_d_reader.rs                       |  8 ++++----
 src/oned/rss/rss_14_reader.rs                  | 16 +++++++++-------
 src/pdf417/decoder/pdf_417_scanning_decoder.rs |  4 ++++
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/common/string_utils.rs b/src/common/string_utils.rs
index 46843e2..2d22559 100644
--- a/src/common/string_utils.rs
+++ b/src/common/string_utils.rs
@@ -78,13 +78,13 @@ impl StringUtils {
                 .unwrap()
                 .name()
         {
-             "SJIS"
+            "SJIS"
         } else if c.name() == encoding::all::UTF_8.name() {
-             "UTF8"
+            "UTF8"
         } else if c.name() == encoding::all::ISO_8859_1.name() {
-             "ISO8859_1"
-        }else {
-     c.name()
+            "ISO8859_1"
+        } else {
+            c.name()
         }
     }
 
diff --git a/src/oned/ean_manufacturer_org_support.rs b/src/oned/ean_manufacturer_org_support.rs
index 9099fd1..5c61288 100644
--- a/src/oned/ean_manufacturer_org_support.rs
+++ b/src/oned/ean_manufacturer_org_support.rs
@@ -46,7 +46,7 @@ impl EANManufacturerOrgSupport {
         // let prefix = Integer.parseInt(productCode.substring(0, 3));
         let max = self.ranges.len();
         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++) {
             // let range = self.ranges.get(i).expect("must have index i or fail");
             let start = range[0];
@@ -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(),
                 );
             }
         }
diff --git a/src/oned/one_d_reader.rs b/src/oned/one_d_reader.rs
index 67803fd..46de1eb 100644
--- a/src/oned/one_d_reader.rs
+++ b/src/oned/one_d_reader.rs
@@ -98,10 +98,10 @@ pub trait OneDReader: Reader {
                 if attempt == 1 {
                     // trying again?
                     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
-                                   // 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
-                                   // that start on the center line.
+                                            // 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,
+                                            // don't want to clutter with noise from every single row scan -- just the scans
+                                            // that start on the center line.
                     if hints.contains_key(&DecodeHintType::NEED_RESULT_POINT_CALLBACK) {
                         // let newHints = HashMap::new();
                         // newHints.putAll(hints);
diff --git a/src/oned/rss/rss_14_reader.rs b/src/oned/rss/rss_14_reader.rs
index 5ba8563..cc8db8a 100644
--- a/src/oned/rss/rss_14_reader.rs
+++ b/src/oned/rss/rss_14_reader.rs
@@ -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;
+                    // 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)?;
diff --git a/src/pdf417/decoder/pdf_417_scanning_decoder.rs b/src/pdf417/decoder/pdf_417_scanning_decoder.rs
index 7a64f28..d405a19 100644
--- a/src/pdf417/decoder/pdf_417_scanning_decoder.rs
+++ b/src/pdf417/decoder/pdf_417_scanning_decoder.rs
@@ -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