add jjn and atkinson

This commit is contained in:
David 2021-01-11 19:52:05 -05:00
parent 2bada11da1
commit b9c6cf1a07
2 changed files with 64 additions and 0 deletions

View File

@ -53,6 +53,10 @@ func main() {
new = apply(i, simpleErrorDiffusion()) new = apply(i, simpleErrorDiffusion())
case "floydsteinberg": case "floydsteinberg":
new = apply(i, floydSteinberg()) new = apply(i, floydSteinberg())
case "jjn":
new = apply(i, jarvisJudiceNinke())
case "atkinson":
new = apply(i, atkinson())
default: default:
fmt.Printf("unknown ditherer option: %s\n", ditherer) fmt.Printf("unknown ditherer option: %s\n", ditherer)
os.Exit(2) os.Exit(2)

View File

@ -180,6 +180,66 @@ func floydSteinberg() quantizerFunction {
} }
} }
func jarvisJudiceNinke() quantizerFunction {
errMap := make(map[coord]float64)
d := diffusion{
divisor: 48.0,
matrix: map[coord]float64{
{x: 1, y: 0}: 7.0,
{x: 2, y: 0}: 5.0,
{x: -2, y: 1}: 3.0,
{x: -1, y: 1}: 5.0,
{x: 0, y: 1}: 7.0,
{x: 1, y: 1}: 5.0,
{x: 2, y: 1}: 3.0,
{x: -2, y: 2}: 1.0,
{x: -1, y: 2}: 3.0,
{x: 0, y: 2}: 5.0,
{x: 1, y: 2}: 3.0,
{x: 2, y: 2}: 1.0,
},
}
return func(x int, y int, c color.Color) color.Color {
p := coord{x: x, y: y}
l := luminence(c) + errMap[p]
delete(errMap, p) // don't let the error map grow too big
if l > 0.5 {
applyError(d, l-1.0, p, errMap)
return color.White
}
applyError(d, l, p, errMap)
return color.Black
}
}
func atkinson() quantizerFunction {
errMap := make(map[coord]float64)
d := diffusion{
divisor: 8.0,
matrix: map[coord]float64{
{x: 1, y: 0}: 1.0,
{x: 2, y: 0}: 1.0,
{x: -1, y: 1}: 1.0,
{x: 0, y: 1}: 1.0,
{x: 1, y: 1}: 1.0,
{x: 0, y: 2}: 1.0,
},
}
return func(x int, y int, c color.Color) color.Color {
p := coord{x: x, y: y}
l := luminence(c) + errMap[p]
delete(errMap, p) // don't let the error map grow too big
if l > 0.5 {
applyError(d, l-1.0, p, errMap)
return color.White
}
applyError(d, l, p, errMap)
return color.Black
}
}
// That is, "relative luminance": https://en.wikipedia.org/wiki/Relative_luminance. // That is, "relative luminance": https://en.wikipedia.org/wiki/Relative_luminance.
// go's color library doesn't give any information on what "color space" the RGBA is derived from, // go's color library doesn't give any information on what "color space" the RGBA is derived from,
// so we convert to Y'CbCr, which returns luminence directly as the Y component. // so we convert to Y'CbCr, which returns luminence directly as the Y component.