From 86d0cb917ba4320e9ba2bbe7bc5b020c594ba8bf Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Wed, 9 Aug 2023 22:56:06 +0530 Subject: [PATCH] fix: hardsubx erros --- src/rust/src/main.rs | 12 ++++++------ src/rust/src/structs.rs | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/rust/src/main.rs b/src/rust/src/main.rs index 7a6c4092f..055d67797 100644 --- a/src/rust/src/main.rs +++ b/src/rust/src/main.rs @@ -527,11 +527,11 @@ fn main() { } if let Some(ref value) = args.min_sub_duration { - if value == 0.0 { + if *value == 0.0 { println!("Invalid minimum subtitle duration"); std::process::exit(ExitCode::MalformedParameter as i32); } - opt.hardsubx_min_sub_duration = Some(value); + opt.hardsubx_min_sub_duration = Some(*value); } if args.detect_italics { @@ -539,19 +539,19 @@ fn main() { } if let Some(ref value) = args.conf_thresh { - if !(0.0..=100.0).contains(&value) { + if !(0.0..=100.0).contains(value) { println!("Invalid confidence threshold, valid values are between 0 & 100"); std::process::exit(ExitCode::MalformedParameter as i32); } - opt.hardsubx_conf_thresh = Some(value); + opt.hardsubx_conf_thresh = Some(*value); } if let Some(ref value) = args.whiteness_thresh { - if !(0.0..=100.0).contains(&value) { + if !(0.0..=100.0).contains(value) { println!("Invalid whiteness threshold, valid values are between 0 & 100"); std::process::exit(ExitCode::MalformedParameter as i32); } - opt.hardsubx_lum_thresh = Some(value); + opt.hardsubx_lum_thresh = Some(*value); } } } // END OF HARDSUBX diff --git a/src/rust/src/structs.rs b/src/rust/src/structs.rs index 20df064bb..a9a61fd2f 100644 --- a/src/rust/src/structs.rs +++ b/src/rust/src/structs.rs @@ -436,8 +436,8 @@ pub struct CcxSOptions { pub append_mode: bool, pub ucla: bool, pub tickertext: bool, - pub hardsubx: Option, - pub hardsubx_and_common: Option, + pub hardsubx: bool, + pub hardsubx_and_common: bool, pub dvblang: Option, pub ocrlang: Option, pub ocr_oem: Option, @@ -447,7 +447,7 @@ pub struct CcxSOptions { pub hardsubx_ocr_mode: Option, pub hardsubx_subcolor: Option, pub hardsubx_min_sub_duration: Option, - pub hardsubx_detect_italics: Option, + pub hardsubx_detect_italics: bool, pub hardsubx_conf_thresh: Option, pub hardsubx_hue: Option, pub hardsubx_lum_thresh: Option,