diff options
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/main.rs b/src/main.rs index 0da4f13..df6b948 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -use crate::{bmp::BMPImage, image::{Image, ImageBase, RGB}, reader::FileReader, writer::FileWriter}; +use crate::{bmp::BMPImage, png::PNGImage, image::{Image, ImageBase, RGB}, reader::FileReader, writer::FileWriter}; use std::{env, fs::File, io::{BufReader, BufWriter}}; mod reader; @@ -6,20 +6,23 @@ mod image; mod bmp; mod writer; mod byte_encode; +mod png; +mod crc; +mod zlib; fn main() { let args: Vec<String> = env::args().collect(); if args.len() != 3 { - panic!("USAGE: <program> infline.bmp outfile.bmp"); + panic!("USAGE: <program> infline.png outfile.bmp"); } - let file = File::open(args[1].clone()).expect("File does not exist"); - let mut reader = FileReader::new(BufReader::new(file)); - let _bmp: ImageBase<RGB<u8>> = BMPImage::read_image(&mut reader).expect("Bitmap had error"); + let infile = File::open(args[1].clone()).expect("infile does not exist"); + let mut reader = FileReader::new(BufReader::new(infile)); + let png: ImageBase<RGB<u8>> = PNGImage::read_image(&mut reader).expect("PNG had error"); - let out_file = File::create(args[2].clone()).expect("Cannot create file"); + let out_file = File::create(args[2].clone()).expect("Cannot create outfile"); let mut writer = FileWriter::new(BufWriter::new(out_file)); - BMPImage::write_image(&_bmp, &mut writer); + BMPImage::write_image(&png, &mut writer); // println!("{_bmp:?}"); } |