From 9e3729b1527d5e2bdfa1e2b03a0a9c99987dd0bc Mon Sep 17 00:00:00 2001 From: JimBobSquarePants Date: Fri, 6 Oct 2017 11:34:16 +1100 Subject: [PATCH 1/2] Ensure colormap cache is cleared --- src/ImageSharp/Quantizers/OctreeQuantizer{TPixel}.cs | 1 + src/ImageSharp/Quantizers/PaletteQuantizer{TPixel}.cs | 1 + src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs | 1 + 3 files changed, 3 insertions(+) diff --git a/src/ImageSharp/Quantizers/OctreeQuantizer{TPixel}.cs b/src/ImageSharp/Quantizers/OctreeQuantizer{TPixel}.cs index 49adce23b..8766f1042 100644 --- a/src/ImageSharp/Quantizers/OctreeQuantizer{TPixel}.cs +++ b/src/ImageSharp/Quantizers/OctreeQuantizer{TPixel}.cs @@ -61,6 +61,7 @@ namespace SixLabors.ImageSharp.Quantizers this.colors = (byte)maxColors.Clamp(1, 255); this.octree = new Octree(this.GetBitsNeededForColorDepth(this.colors)); this.palette = null; + this.colorMap.Clear(); return base.Quantize(image, this.colors); } diff --git a/src/ImageSharp/Quantizers/PaletteQuantizer{TPixel}.cs b/src/ImageSharp/Quantizers/PaletteQuantizer{TPixel}.cs index ca11a042f..0b95c09a6 100644 --- a/src/ImageSharp/Quantizers/PaletteQuantizer{TPixel}.cs +++ b/src/ImageSharp/Quantizers/PaletteQuantizer{TPixel}.cs @@ -58,6 +58,7 @@ namespace SixLabors.ImageSharp.Quantizers public override QuantizedImage Quantize(ImageFrame image, int maxColors) { Array.Resize(ref this.colors, maxColors.Clamp(1, 255)); + this.colorMap.Clear(); return base.Quantize(image, maxColors); } diff --git a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs index 77c421468..8ab390f4e 100644 --- a/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs +++ b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs @@ -139,6 +139,7 @@ namespace SixLabors.ImageSharp.Quantizers this.colors = maxColors.Clamp(1, 255); this.palette = null; + this.colorMap.Clear(); try { From 3909313a87f774c0aa22ebb3e7742d302f0a3794 Mon Sep 17 00:00:00 2001 From: JimBobSquarePants Date: Fri, 6 Oct 2017 11:34:41 +1100 Subject: [PATCH 2/2] FS makes much smaller files --- src/ImageSharp/Quantizers/QuantizerBase{TPixel}.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ImageSharp/Quantizers/QuantizerBase{TPixel}.cs b/src/ImageSharp/Quantizers/QuantizerBase{TPixel}.cs index 7f58ff1bf..20ba2e637 100644 --- a/src/ImageSharp/Quantizers/QuantizerBase{TPixel}.cs +++ b/src/ImageSharp/Quantizers/QuantizerBase{TPixel}.cs @@ -43,7 +43,7 @@ namespace SixLabors.ImageSharp.Quantizers.Base public bool Dither { get; set; } = true; /// - public IErrorDiffuser DitherType { get; set; } = new SierraLiteDiffuser(); + public IErrorDiffuser DitherType { get; set; } = new FloydSteinbergDiffuser(); /// public virtual QuantizedImage Quantize(ImageFrame image, int maxColors)