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

Switch to using zopfli::Options in prep for https://github.com/zopfli-rs/zopfli/pull/21

Browse source
This commit is contained in:
Chris Hennick 2023-06-24 11:37:15 -07:00
parent a688086d27
commit cd57847c15
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/deflate/mod.rs
View file

@ -59,35 +59,22 @@ impl Deflater for Deflaters {
#[cfg(feature = "zopfli")] #[cfg(feature = "zopfli")]
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
pub struct BufferedZopfliDeflater { pub struct BufferedZopfliDeflater {
iterations: NonZeroU8,
input_buffer_size: usize, input_buffer_size: usize,
output_buffer_size: usize, output_buffer_size: usize,
max_block_splits: u16, options: Options
} }
#[cfg(feature = "zopfli")] #[cfg(feature = "zopfli")]
impl BufferedZopfliDeflater { impl BufferedZopfliDeflater {
pub const fn new( pub const fn new(
iterations: NonZeroU8,
input_buffer_size: usize, input_buffer_size: usize,
output_buffer_size: usize, output_buffer_size: usize,
max_block_splits: u16, options: Options,
) -> Self { ) -> Self {
BufferedZopfliDeflater { BufferedZopfliDeflater {
iterations,
input_buffer_size, input_buffer_size,
output_buffer_size, output_buffer_size,
max_block_splits, options,
}
}
pub const fn const_default() -> Self {
BufferedZopfliDeflater {
// SAFETY: trivially safe. Stopgap solution until const unwrap is stabilized.
iterations: unsafe { NonZeroU8::new_unchecked(15) },
input_buffer_size: 1024 * 1024,
output_buffer_size: 64 * 1024,
max_block_splits: 15,
} }
} }
} }
@ -95,7 +82,11 @@ impl BufferedZopfliDeflater {
#[cfg(feature = "zopfli")] #[cfg(feature = "zopfli")]
impl Default for BufferedZopfliDeflater { impl Default for BufferedZopfliDeflater {
fn default() -> Self { fn default() -> Self {
Self::const_default() BufferedZopfliDeflater {
input_buffer_size: 1024 * 1024,
output_buffer_size: 64 * 1024,
options: Options::default()
}
} }
} }
@ -104,12 +95,6 @@ impl Deflater for BufferedZopfliDeflater {
/// Fork of the zlib_compress function in Zopfli. /// Fork of the zlib_compress function in Zopfli.
fn deflate(&self, data: &[u8], max_size: &AtomicMin) -> PngResult<Vec<u8>> { fn deflate(&self, data: &[u8], max_size: &AtomicMin) -> PngResult<Vec<u8>> {
#[allow(clippy::needless_update)]
let options = Options {
iteration_count: self.iterations,
maximum_block_splits: self.max_block_splits,
..Default::default() // for forward compatibility
};
let mut out = Cursor::new(Vec::with_capacity(self.output_buffer_size)); let mut out = Cursor::new(Vec::with_capacity(self.output_buffer_size));
let cmf = 120; /* CM 8, CINFO 7. See zlib spec.*/ let cmf = 120; /* CM 8, CINFO 7. See zlib spec.*/
let flevel = 3; let flevel = 3;
@ -125,7 +110,7 @@ impl Deflater for BufferedZopfliDeflater {
let mut buffer = BufWriter::with_capacity( let mut buffer = BufWriter::with_capacity(
self.input_buffer_size, self.input_buffer_size,
DeflateEncoder::new( DeflateEncoder::new(
options, self.options,
Default::default(), Default::default(),
&mut out, &mut out,
), ),