Garmelon/mark
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove manhattan square distance

Browse source
This commit is contained in:
Joscha 2023-07-30 21:51:06 +02:00
parent cf3b2d8f67
commit f27252760e
2 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/dither.rs
View file

@ -75,16 +75,6 @@ impl<C: AsRef<[f32; 3]>> Difference<C> for DiffManhattan {
}
}
pub struct DiffManhattanSquare;
impl<C: AsRef<[f32; 3]>> Difference<C> 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 //
/////////////

23
src/main.rs
View file

@ -93,8 +93,6 @@ enum DitherDifference {
Ciede2000Clamp,
Manhattan,
ManhattanClamp,
ManhattanSquare,
ManhattanSquareClamp,
}
#[derive(Debug, Clone, Copy)]
@ -173,19 +171,16 @@ impl DitherCmd {
C: Sub<C, Output = C>,
Srgb: IntoColor<C>,
{
use DitherDifference::*;
match self.difference {
DitherDifference::Euclid => self.run_cd::<C, DiffEuclid>(image),
DitherDifference::EuclidClamp => self.run_cd::<C, DiffClamp<DiffEuclid>>(image),
DitherDifference::HyAb => self.run_cd::<C, DiffHyAb>(image),
DitherDifference::HyAbClamp => self.run_cd::<C, DiffClamp<DiffHyAb>>(image),
DitherDifference::Ciede2000 => self.run_cd::<C, DiffCiede2000>(image),
DitherDifference::Ciede2000Clamp => self.run_cd::<C, DiffClamp<DiffCiede2000>>(image),
DitherDifference::Manhattan => self.run_cd::<C, DiffManhattan>(image),
DitherDifference::ManhattanClamp => self.run_cd::<C, DiffClamp<DiffManhattan>>(image),
DitherDifference::ManhattanSquare => self.run_cd::<C, DiffManhattanSquare>(image),
DitherDifference::ManhattanSquareClamp => {
self.run_cd::<C, DiffClamp<DiffManhattanSquare>>(image)
}
Euclid => self.run_cd::<C, DiffEuclid>(image),
EuclidClamp => self.run_cd::<C, DiffClamp<DiffEuclid>>(image),
HyAb => self.run_cd::<C, DiffHyAb>(image),
HyAbClamp => self.run_cd::<C, DiffClamp<DiffHyAb>>(image),
Ciede2000 => self.run_cd::<C, DiffCiede2000>(image),
Ciede2000Clamp => self.run_cd::<C, DiffClamp<DiffCiede2000>>(image),
Manhattan => self.run_cd::<C, DiffManhattan>(image),
ManhattanClamp => self.run_cd::<C, DiffClamp<DiffManhattan>>(image),
}
}