From 849c3769fbd38940c9bfa73bcea160848a38d9b6 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 6 Dec 2022 16:45:30 +0100 Subject: simplify block type --- evc/src/codec/decode.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'evc/src/codec/decode.rs') diff --git a/evc/src/codec/decode.rs b/evc/src/codec/decode.rs index 9dc6a69..f4559c8 100644 --- a/evc/src/codec/decode.rs +++ b/evc/src/codec/decode.rs @@ -1,18 +1,14 @@ -use crate::{ - block::{Block, BlockInner}, - frame::Frame, - view::View, -}; +use crate::{block::Block, frame::Frame, view::View}; pub fn decode_block(block: &Block, mut target: View<&mut Frame>, prev: View<&Frame>) { - match &block.inner { - BlockInner::Literal(pixels) => target.set_pixels(pixels), - BlockInner::Split(box [a, b]) => { + match &block { + Block::Literal(pixels) => target.set_pixels(pixels), + Block::Split(box [a, b]) => { let [at, bt] = target.split_mut_unsafe(); let [ap, bp] = prev.split(); decode_block(a, at, ap); decode_block(b, bt, bp); } - BlockInner::Reference { translation: _ } => target.copy_from(&prev), + Block::Reference { translation: _ } => target.copy_from(&prev), } } -- cgit v1.2.3-70-g09d2