From 62ebd64aae0a5f01efa3c620fa5699e076200808 Mon Sep 17 00:00:00 2001
From: Andrew <andrew@digerati.co.nz>
Date: Sun, 23 Oct 2022 18:13:29 +1300
Subject: [PATCH] Use libdeflater in evaluate

---
 src/evaluate.rs | 7 +------
 src/png/mod.rs  | 7 ++-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/evaluate.rs b/src/evaluate.rs
index 0e07d308..fadc3bc6 100644
--- a/src/evaluate.rs
+++ b/src/evaluate.rs
@@ -7,8 +7,6 @@ use crate::png::PngData;
 use crate::png::PngImage;
 use crate::png::STD_COMPRESSION;
 use crate::png::STD_FILTERS;
-use crate::png::STD_STRATEGY;
-use crate::png::STD_WINDOW;
 #[cfg(not(feature = "parallel"))]
 use crate::rayon;
 use crate::Deadline;
@@ -116,13 +114,10 @@ impl Evaluator {
                 if deadline.passed() {
                     return;
                 }
-                if let Ok(idat_data) = deflate::deflate(
+                if let Ok(idat_data) = deflate::libdeflater_deflate(
                     &image.filter_image(filter),
                     STD_COMPRESSION,
-                    STD_STRATEGY,
-                    STD_WINDOW,
                     &best_candidate_size,
-                    &deadline,
                 ) {
                     best_candidate_size.set_min(idat_data.len());
                     // ignore baseline images after this point
diff --git a/src/png/mod.rs b/src/png/mod.rs
index b625de9c..d0da5527 100644
--- a/src/png/mod.rs
+++ b/src/png/mod.rs
@@ -14,11 +14,8 @@ use std::iter::Iterator;
 use std::path::Path;
 use std::sync::Arc;
 
-pub(crate) const STD_COMPRESSION: u8 = 6;
-/// Must use normal compression, as faster ones (Huffman/RLE-only) are not representative
-pub(crate) const STD_STRATEGY: u8 = 0;
-/// OK to use a bit smalller window for evaluation
-pub(crate) const STD_WINDOW: u8 = 13;
+/// Must use normal (lazy) compression, as faster ones (greedy) are not representative
+pub(crate) const STD_COMPRESSION: u8 = 5;
 pub(crate) const STD_FILTERS: [u8; 2] = [0, 5];
 
 pub(crate) mod scan_lines;