Skip to content

Commit

Permalink
fix(codecs): updated avif decoder to new api
Browse files Browse the repository at this point in the history
  • Loading branch information
SalOne22 committed Apr 11, 2024
1 parent 04eeb80 commit 1c8ea8e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
5 changes: 2 additions & 3 deletions src/codecs/avif/decoder/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{io::Read, marker::PhantomData};

use zune_core::{bytestream::ZReaderTrait, colorspace::ColorSpace};
use zune_core::colorspace::ColorSpace;
use zune_image::{errors::ImageErrors, image::Image, traits::DecoderTrait};

/// A AVIF decoder
Expand All @@ -24,10 +24,9 @@ impl<R: Read> AvifDecoder<R> {
}
}

impl<R, T> DecoderTrait<T> for AvifDecoder<R>
impl<R> DecoderTrait for AvifDecoder<R>
where
R: Read,
T: ZReaderTrait,
{
fn decode(&mut self) -> Result<Image, ImageErrors> {
let img = libavif::decode_rgb(&self.inner)
Expand Down
13 changes: 4 additions & 9 deletions src/codecs/avif/decoder/tests.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
use std::fs::read;

use zune_core::bytestream::ZByteReader;
use std::fs::File;

use super::*;

#[test]
fn decode() {
let file_content = read("tests/files/avif/f1t.avif").unwrap();

let reader = ZByteReader::new(file_content);
let file_content = File::open("tests/files/avif/f1t.avif").unwrap();

let mut decoder = AvifDecoder::try_new(reader).unwrap();
let mut decoder = AvifDecoder::try_new(file_content).unwrap();

let img =
<AvifDecoder<ZByteReader<Vec<u8>>> as DecoderTrait<Vec<u8>>>::decode(&mut decoder).unwrap();
let img = Image::from_decoder(decoder).unwrap();

assert_eq!(img.dimensions(), (48, 80));
assert_eq!(img.colorspace(), ColorSpace::RGBA);
Expand Down

0 comments on commit 1c8ea8e

Please sign in to comment.