Skip to content

Commit

Permalink
Fix #647
Browse files Browse the repository at this point in the history
  • Loading branch information
@JimBobSquarePants
JimBobSquarePants committed Jan 30, 2018
1 parent 8b2de6c commit 8179758
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/ImageProcessor/Imaging/Quantizers/WuQuantizer/WuQuantizer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private static IEnumerable<byte[]> IndexedPixels(ImageBuffer image, Color32[] lo
{
Color32 pixel = pixelLine[i];
byte bestMatch = fallback;
if (pixel.A > alphaThreshold)
if (pixel.A >= alphaThreshold)
{
bestMatch = lookup.GetPaletteIndex(pixel);
paletteHistogram[bestMatch].AddPixel(pixel);
Expand Down
64 changes: 53 additions & 11 deletions src/ImageProcessor/Imaging/Quantizers/WuQuantizer/WuQuantizerBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,48 @@ public abstract class WuQuantizerBase : IWuQuantizer
/// </summary>
private const int MaxSideIndex = 32;

/// <summary>
/// The transparency threshold.
/// </summary>
private byte threshold = 0;

/// <summary>
/// The transparency fade.
/// </summary>
private byte fade = 1;

/// <summary>
/// Gets or sets the transparency threshold (0 - 255)
/// </summary>
public byte Threshold
{
get
{
return this.threshold;
}

set
{
this.threshold = value;
}
}

/// <summary>
/// Gets or sets the alpha fade (0 - 255)
/// </summary>
public byte Fade
{
get
{
return this.fade;
}

set
{
this.fade = value;
}
}

/// <summary>
/// Quantize an image and return the resulting output bitmap
/// </summary>
Expand All @@ -79,7 +121,7 @@ public abstract class WuQuantizerBase : IWuQuantizer
/// </returns>
public Bitmap Quantize(Image source)
{
return this.Quantize(source, 0, 1);
return this.Quantize(source, this.Threshold, this.Fade);
}

/// <summary>
Expand Down Expand Up @@ -209,7 +251,7 @@ public Bitmap Quantize(Image source, int alphaThreshold, int alphaFader, Histogr
[SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1001:CommasMustBeSpacedCorrectly", Justification = "Reviewed. Suppression is OK here.")]
private static void BuildHistogram(Histogram histogram, ImageBuffer imageBuffer, int alphaThreshold, int alphaFader)
{
ColorMoment[, , ,] moments = histogram.Moments;
ColorMoment[,,,] moments = histogram.Moments;

foreach (Color32[] pixelLine in imageBuffer.PixelLines)
{
Expand Down Expand Up @@ -248,7 +290,7 @@ private static void BuildHistogram(Histogram histogram, ImageBuffer imageBuffer,
/// The three dimensional array of <see cref="ColorMoment"/> to process.
/// </param>
[SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1001:CommasMustBeSpacedCorrectly", Justification = "Reviewed. Suppression is OK here.")]
private static void CalculateMoments(ColorMoment[, , ,] moments)
private static void CalculateMoments(ColorMoment[,,,] moments)
{
ColorMoment[,] areaSquared = new ColorMoment[SideSize, SideSize];
ColorMoment[] area = new ColorMoment[SideSize];
Expand Down Expand Up @@ -294,7 +336,7 @@ private static void CalculateMoments(ColorMoment[, , ,] moments)
/// The <see cref="ColorMoment"/> representing the top of the cube.
/// </returns>
[SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1001:CommasMustBeSpacedCorrectly", Justification = "Reviewed. Suppression is OK here.")]
private static ColorMoment Top(Box cube, int direction, int position, ColorMoment[, , ,] moment)
private static ColorMoment Top(Box cube, int direction, int position, ColorMoment[,,,] moment)
{
switch (direction)
{
Expand Down Expand Up @@ -359,7 +401,7 @@ private static ColorMoment Top(Box cube, int direction, int position, ColorMomen
/// The <see cref="ColorMoment"/> representing the bottom of the cube.
/// </returns>
[SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1001:CommasMustBeSpacedCorrectly", Justification = "Reviewed. Suppression is OK here.")]
private static ColorMoment Bottom(Box cube, int direction, ColorMoment[, , ,] moment)
private static ColorMoment Bottom(Box cube, int direction, ColorMoment[,,,] moment)
{
switch (direction)
{
Expand Down Expand Up @@ -433,7 +475,7 @@ private static ColorMoment Bottom(Box cube, int direction, ColorMoment[, , ,] mo
/// The <see cref="CubeCut"/> representing the sum.
/// </returns>
[SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1001:CommasMustBeSpacedCorrectly", Justification = "Reviewed. Suppression is OK here.")]
private static CubeCut Maximize(ColorMoment[, , ,] moments, Box cube, int direction, byte first, byte last, ColorMoment whole)
private static CubeCut Maximize(ColorMoment[,,,] moments, Box cube, int direction, byte first, byte last, ColorMoment whole)
{
ColorMoment bottom = Bottom(cube, direction, moments);
float result = 0.0f;
Expand Down Expand Up @@ -481,7 +523,7 @@ private static CubeCut Maximize(ColorMoment[, , ,] moments, Box cube, int direct
/// The <see cref="bool"/> indicating the result.
/// </returns>
[SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1001:CommasMustBeSpacedCorrectly", Justification = "Reviewed. Suppression is OK here.")]
private static bool Cut(ColorMoment[, , ,] moments, ref Box first, ref Box second)
private static bool Cut(ColorMoment[,,,] moments, ref Box first, ref Box second)
{
int direction;
ColorMoment whole = Volume(moments, first);
Expand Down Expand Up @@ -591,7 +633,7 @@ private static bool Cut(ColorMoment[, , ,] moments, ref Box first, ref Box secon
/// The <see cref="float"/> representing the variance.
/// </returns>
[SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1001:CommasMustBeSpacedCorrectly", Justification = "Reviewed. Suppression is OK here.")]
private static float CalculateVariance(ColorMoment[, , ,] moments, Box cube)
private static float CalculateVariance(ColorMoment[,,,] moments, Box cube)
{
ColorMoment volume = Volume(moments, cube);
return volume.Variance();
Expand All @@ -610,7 +652,7 @@ private static float CalculateVariance(ColorMoment[, , ,] moments, Box cube)
/// The <see cref="float"/> representing the volume.
/// </returns>
[SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1001:CommasMustBeSpacedCorrectly", Justification = "Reviewed. Suppression is OK here.")]
private static ColorMoment Volume(ColorMoment[, , ,] moments, Box cube)
private static ColorMoment Volume(ColorMoment[,,,] moments, Box cube)
{
return (moments[cube.AlphaMaximum, cube.RedMaximum, cube.GreenMaximum, cube.BlueMaximum] -
moments[cube.AlphaMaximum, cube.RedMaximum, cube.GreenMinimum, cube.BlueMaximum] -
Expand Down Expand Up @@ -644,7 +686,7 @@ private static ColorMoment Volume(ColorMoment[, , ,] moments, Box cube)
/// The array <see cref="Box"/>.
/// </returns>
[SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1001:CommasMustBeSpacedCorrectly", Justification = "Reviewed. Suppression is OK here.")]
private static Box[] SplitData(ref int colorCount, ColorMoment[, , ,] moments)
private static Box[] SplitData(ref int colorCount, ColorMoment[,,,] moments)
{
--colorCount;
int next = 0;
Expand Down Expand Up @@ -706,7 +748,7 @@ private static Box[] SplitData(ref int colorCount, ColorMoment[, , ,] moments)
/// The array of <see cref="Color32"/>.
/// </returns>
[SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1001:CommasMustBeSpacedCorrectly", Justification = "Reviewed. Suppression is OK here.")]
private static Color32[] BuildLookups(Box[] cubes, ColorMoment[, , ,] moments)
private static Color32[] BuildLookups(Box[] cubes, ColorMoment[,,,] moments)
{
Color32[] lookups = new Color32[cubes.Length];

Expand Down

0 comments on commit 8179758

Please sign in to comment.