diff options
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main.rs b/src/main.rs index 1f5dc8a..9309f63 100644 --- a/src/main.rs +++ b/src/main.rs | |||
@@ -15,6 +15,7 @@ use std::{ | |||
15 | env, | 15 | env, |
16 | fs::OpenOptions, | 16 | fs::OpenOptions, |
17 | io::{Cursor, Read}, | 17 | io::{Cursor, Read}, |
18 | path::{Path, PathBuf}, | ||
18 | }; | 19 | }; |
19 | 20 | ||
20 | use log::{error, info}; | 21 | use log::{error, info}; |
@@ -41,15 +42,15 @@ pub fn main() { | |||
41 | 42 | ||
42 | let args: Vec<_> = env::args().collect(); | 43 | let args: Vec<_> = env::args().collect(); |
43 | if args.len() < 2 { | 44 | if args.len() < 2 { |
44 | AppState::init(160, 160, &sdl_context, &ttf_context, None).run(); | 45 | AppState::init(160, 160, &sdl_context, &ttf_context, None, None).run(); |
45 | return; | 46 | return; |
46 | } else { | 47 | } else { |
47 | let path = args.get(1).unwrap(); | 48 | let path = PathBuf::from(args.get(1).unwrap()); |
48 | let image_src = OpenOptions::new() | 49 | let image_src = OpenOptions::new() |
49 | .read(true) | 50 | .read(true) |
50 | .write(false) | 51 | .write(false) |
51 | .create(false) | 52 | .create(false) |
52 | .open(path); | 53 | .open(&path); |
53 | if let Ok(mut image) = image_src { | 54 | if let Ok(mut image) = image_src { |
54 | let mut buf = Vec::new(); | 55 | let mut buf = Vec::new(); |
55 | image.read_to_end(&mut buf).unwrap(); | 56 | image.read_to_end(&mut buf).unwrap(); |
@@ -61,8 +62,10 @@ pub fn main() { | |||
61 | &sdl_context, | 62 | &sdl_context, |
62 | &ttf_context, | 63 | &ttf_context, |
63 | Some(decoded.data), | 64 | Some(decoded.data), |
65 | Some(&path), | ||
64 | ) | 66 | ) |
65 | .run(); | 67 | .run(); |
68 | } else { | ||
66 | } | 69 | } |
67 | } | 70 | } |
68 | } | 71 | } |