From 5e710e57c4837f8aaedc7c0ae344042f3653635a Mon Sep 17 00:00:00 2001 From: Henry Schimke Date: Tue, 3 Jan 2023 07:10:12 -0600 Subject: [PATCH] fix required for new -> default --- src/oned/coda_bar_reader.rs | 6 +++--- src/oned/code_39_reader.rs | 7 ++++++- src/oned/code_93_reader.rs | 11 ++++++++++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/oned/coda_bar_reader.rs b/src/oned/coda_bar_reader.rs index b489728..ab67764 100644 --- a/src/oned/coda_bar_reader.rs +++ b/src/oned/coda_bar_reader.rs @@ -40,9 +40,9 @@ pub struct CodaBarReader { impl Default for CodaBarReader { fn default() -> Self { Self { - decodeRowRXingResult: Default::default(), - counters: Default::default(), - counterLength: Default::default(), + decodeRowRXingResult: String::with_capacity(20), + counters: vec![0; 80], + counterLength: 0, } } } diff --git a/src/oned/code_39_reader.rs b/src/oned/code_39_reader.rs index 0d1d6cc..aa8b0c6 100644 --- a/src/oned/code_39_reader.rs +++ b/src/oned/code_39_reader.rs @@ -27,13 +27,18 @@ use super::{one_d_reader, OneDReader}; * @author Sean Owen * @see Code93Reader */ -#[derive(OneDReader,Default)] +#[derive(OneDReader)] pub struct Code39Reader { usingCheckDigit: bool, extendedMode: bool, decodeRowRXingResult: String, // counters: Vec, } +impl Default for Code39Reader { + fn default() -> Self { + Self::with_use_check_digit(false) + } +} impl OneDReader for Code39Reader { fn decodeRow( &mut self, diff --git a/src/oned/code_93_reader.rs b/src/oned/code_93_reader.rs index f9b50ff..62f7ac5 100644 --- a/src/oned/code_93_reader.rs +++ b/src/oned/code_93_reader.rs @@ -26,12 +26,21 @@ use super::{one_d_reader, OneDReader}; * @author Sean Owen * @see Code39Reader */ -#[derive(OneDReader,Default)] +#[derive(OneDReader)] pub struct Code93Reader { decodeRowRXingResult: String, counters: [u32; 6], } +impl Default for Code93Reader { + fn default() -> Self { + Self { + decodeRowRXingResult: String::with_capacity(20), + counters: [0; 6], + } + } +} + impl OneDReader for Code93Reader { fn decodeRow( &mut self,