danvics/oxipng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove libdeflate slack space no longer needed

Browse source
This commit is contained in:
Andrew 2023-09-19 20:49:45 +12:00 committed by andrews05
parent 2293b32cce
commit 8eb5a3f419
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/deflate/deflater.rs
View file

@ -4,16 +4,14 @@ use libdeflater::*;
pub fn deflate(data: &[u8], level: u8, max_size: &AtomicMin) -> PngResult<Vec<u8>> { pub fn deflate(data: &[u8], level: u8, max_size: &AtomicMin) -> PngResult<Vec<u8>> {
let mut compressor = Compressor::new(CompressionLvl::new(level.into()).unwrap()); let mut compressor = Compressor::new(CompressionLvl::new(level.into()).unwrap());
// If adhering to a max_size we need to include at least 9 extra bytes of slack space (as specified in docs).
let capacity = max_size let capacity = max_size
.get() .get()
.unwrap_or_else(|| compressor.zlib_compress_bound(data.len())) .unwrap_or_else(|| compressor.zlib_compress_bound(data.len()));
+ 9;
let mut dest = vec![0; capacity]; let mut dest = vec![0; capacity];
let len = compressor let len = compressor
.zlib_compress(data, &mut dest) .zlib_compress(data, &mut dest)
.map_err(|err| match err { .map_err(|err| match err {
CompressionError::InsufficientSpace => PngError::DeflatedDataTooLong(capacity - 9), CompressionError::InsufficientSpace => PngError::DeflatedDataTooLong(capacity),
})?; })?;
dest.truncate(len); dest.truncate(len);
Ok(dest) Ok(dest)