diff --git a/src/dither.rs b/src/dither.rs index c0be645..a82832c 100644 --- a/src/dither.rs +++ b/src/dither.rs @@ -75,16 +75,6 @@ impl> Difference for DiffManhattan { } } -pub struct DiffManhattanSquare; - -impl> Difference for DiffManhattanSquare { - fn diff(a: C, b: C) -> f32 { - let [a1, a2, a3] = a.as_ref(); - let [b1, b2, b3] = b.as_ref(); - (a1 - b1).powi(2) + (a2 - b2).powi(2) + (a3 - b3).powi(3) - } -} - ///////////// // Palette // ///////////// diff --git a/src/main.rs b/src/main.rs index 8868534..1cd340a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -93,8 +93,6 @@ enum DitherDifference { Ciede2000Clamp, Manhattan, ManhattanClamp, - ManhattanSquare, - ManhattanSquareClamp, } #[derive(Debug, Clone, Copy)] @@ -173,19 +171,16 @@ impl DitherCmd { C: Sub, Srgb: IntoColor, { + use DitherDifference::*; match self.difference { - DitherDifference::Euclid => self.run_cd::(image), - DitherDifference::EuclidClamp => self.run_cd::>(image), - DitherDifference::HyAb => self.run_cd::(image), - DitherDifference::HyAbClamp => self.run_cd::>(image), - DitherDifference::Ciede2000 => self.run_cd::(image), - DitherDifference::Ciede2000Clamp => self.run_cd::>(image), - DitherDifference::Manhattan => self.run_cd::(image), - DitherDifference::ManhattanClamp => self.run_cd::>(image), - DitherDifference::ManhattanSquare => self.run_cd::(image), - DitherDifference::ManhattanSquareClamp => { - self.run_cd::>(image) - } + Euclid => self.run_cd::(image), + EuclidClamp => self.run_cd::>(image), + HyAb => self.run_cd::(image), + HyAbClamp => self.run_cd::>(image), + Ciede2000 => self.run_cd::(image), + Ciede2000Clamp => self.run_cd::>(image), + Manhattan => self.run_cd::(image), + ManhattanClamp => self.run_cd::>(image), } }