tuxmain/qoi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove magic field from Header

Browse source
This commit is contained in:
Ivan Smirnov 2022-01-02 22:54:56 +03:00
parent 9289fdd59b
commit d763e1d62c
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/encode.rs
View file

@ -33,7 +33,7 @@ where
let out_size = out.len(); let out_size = out.len();
let mut buf = BytesMut::new(out); let mut buf = BytesMut::new(out);
let header = Header { width, height, channels: N as u8, colorspace, ..Header::default() }; let header = Header { width, height, channels: N as u8, colorspace };
buf = buf.write_many(&header.encode()); buf = buf.write_many(&header.encode());
let mut index = [Pixel::new(); 256]; let mut index = [Pixel::new(); 256];

15
src/header.rs
View file

@ -5,7 +5,6 @@ use crate::utils::unlikely;
#[derive(Copy, Clone, Debug, PartialEq, Eq)] #[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub struct Header { pub struct Header {
pub magic: u32,
pub width: u32, pub width: u32,
pub height: u32, pub height: u32,
pub channels: u8, pub channels: u8,
@ -15,13 +14,7 @@ pub struct Header {
impl Default for Header { impl Default for Header {
#[inline] #[inline]
fn default() -> Self { fn default() -> Self {
Self { Self { width: 1, height: 1, channels: 3, colorspace: ColorSpace::default() }
magic: QOI_MAGIC,
width: 1,
height: 1,
channels: 3,
colorspace: ColorSpace::default(),
}
} }
} }
@ -44,7 +37,7 @@ const fn u32_from_be(v: &[u8]) -> u32 {
impl Header { impl Header {
#[inline] #[inline]
pub const fn new(width: u32, height: u32, channels: u8) -> Self { pub const fn new(width: u32, height: u32, channels: u8) -> Self {
Self { magic: QOI_MAGIC, width, height, channels, colorspace: ColorSpace::Srgb } Self { width, height, channels, colorspace: ColorSpace::Srgb }
} }
#[inline] #[inline]
@ -61,7 +54,7 @@ impl Header {
#[inline] #[inline]
pub(crate) fn encode(&self) -> [u8; QOI_HEADER_SIZE] { pub(crate) fn encode(&self) -> [u8; QOI_HEADER_SIZE] {
let mut out = [0; QOI_HEADER_SIZE]; let mut out = [0; QOI_HEADER_SIZE];
out[..4].copy_from_slice(&u32_to_be(self.magic)); out[..4].copy_from_slice(&u32_to_be(QOI_MAGIC));
out[4..8].copy_from_slice(&u32_to_be(self.width)); out[4..8].copy_from_slice(&u32_to_be(self.width));
out[8..12].copy_from_slice(&u32_to_be(self.height)); out[8..12].copy_from_slice(&u32_to_be(self.height));
out[12] = self.channels; out[12] = self.channels;
@ -89,7 +82,7 @@ impl Header {
} else if unlikely(channels != 3 && channels != 4) { } else if unlikely(channels != 3 && channels != 4) {
return Err(Error::InvalidChannels { channels }); return Err(Error::InvalidChannels { channels });
} }
Ok(Self { magic, width, height, channels, colorspace }) Ok(Self { width, height, channels, colorspace })
} }
#[inline] #[inline]