Skip to content

Commit dabfb22

Browse files
committed
fix logic
1 parent 36b5580 commit dabfb22

1 file changed

Lines changed: 17 additions & 3 deletions

File tree

src/main.rs

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,14 @@ struct Args {
3232

3333
fn main() {
3434
let parser = Args::parse();
35-
let img = image::open(parser.source).unwrap().to_luma8();
35+
let img = image::open(parser.source);
36+
let img = match img {
37+
Ok(r)=>r,
38+
Err(e) => {
39+
eprintln!("Err: {}", &e);
40+
exit(1);
41+
}
42+
}.to_luma8();
3643
let mut prepare_img = rqrr::PreparedImage::prepare(img);
3744
let grids = prepare_img.detect_grids();
3845
if grids.len() == 0{
@@ -42,7 +49,14 @@ fn main() {
4249
match grids[0].decode(){
4350
Ok((_, content))=>{
4451
let mut nodes = Nodes::from_str(&content).unwrap();
45-
let mut target = image::open(parser.target).unwrap();
52+
let target = image::open(parser.target);
53+
let mut target = match target {
54+
Ok(r)=>r,
55+
Err(e) => {
56+
eprintln!("Err: {}", &e);
57+
exit(1);
58+
}
59+
};
4660
let target_img = target.to_luma8();
4761
let mut prepare_target_img = rqrr::PreparedImage::prepare(target_img);
4862
let grid_target = prepare_target_img.detect_grids();
@@ -60,7 +74,7 @@ fn main() {
6074
nodes.set_merchant_name(nodes_target.get_merchant_name().unwrap().to_string());
6175
nodes.set_postal_code(nodes_target.get_postal_code().unwrap().to_string());
6276
nodes.rewrite_crc16();
63-
let qr_modified = nodes_target.dumps();
77+
let qr_modified = nodes.dumps();
6478
let qrcode = QrCode::new(qr_modified).unwrap();
6579
let result = qrcode.render::<Rgb<u8>>().max_dimensions(if parser.raw{parser.size}else{width}, if parser.raw{parser.size}else{height}).quiet_zone(parser.raw).build();
6680
if parser.raw {

0 commit comments

Comments
 (0)