schrottkatze/iowo
1
0
Fork 0
mirror of https://forge.katzen.cafe/katzen-cafe/iowo.git synced 2024-11-05 07:16:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: remove unneeded source format in read instruction

Browse source 
The image crate is able to infer the format, so that data is redundant
This commit is contained in:
Schrottkatze 2024-01-23 12:40:25 +01:00
parent 10886be00a
commit d79383a7df
Signed by: schrottkatze
GPG key ID: DFD0FD205943C14A
4 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/eval/src/kind/debug/instr/mod.rs
View file

@ -2,7 +2,7 @@ pub mod read {
use image::{io::Reader as ImageReader, DynamicImage};
use ir::instruction::read::{Read, SourceType};
pub fn read(Read { source, .. }: Read) -> DynamicImage {
pub fn read(Read { source }: Read) -> DynamicImage {
// TODO: actual error handling
let img = ImageReader::open(match source {
SourceType::File(path) => path,

7
crates/ir/src/instruction/read.rs
View file

@ -4,16 +4,9 @@ use std::path::PathBuf;
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
pub struct Read {
pub source: SourceType,
pub format: SourceFormat,
}
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
pub enum SourceType {
File(PathBuf),
}
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
pub enum SourceFormat {
Jpeg,
Png,
}

1
testfiles/bare.ron
View file

@ -2,7 +2,6 @@
instructions: {
0: Read((
source: File("testfiles/rails.png"),
format: Png,
)),
1: Write((
target: File("testfiles/gen/out.jpg"),

1
testfiles/invert.ron
View file

@ -2,7 +2,6 @@
instructions: {
0: Read((
source: File("testfiles/rails.png"),
format: Png,
)),
1: Filter(Invert),
2: Write((