Add files via upload

Author: mcychan

nQuant.Master/GilbertCurve.cs

@@ -133,8 +133,8 @@ private int DitherPixel(int x, int y, Color c2, float beta)
 			if (palette.Length < 3 || margin > 6) {
 				var delta = (weight > .0015 && weight < .0025) ? beta : Math.PI;
 				if (palette.Length > 4 && (CIELABConvertor.Y_Diff(pixel, c2) > (delta * acceptedDiff) || CIELABConvertor.U_Diff(pixel, c2) < (margin * acceptedDiff))) {
-					var kappa = saliencies[bidx] < .4f ? beta * .4f * saliencies[bidx] : beta * .4f / saliencies[bidx];
-					var c1 = saliencies[bidx] < .4f ? pixel : Color.FromArgb(a_pix, r_pix, g_pix, b_pix);
+					var kappa = saliencies[bidx] < .4f ? beta * .4f / saliencies[bidx] : beta * .4f / saliencies[bidx];
+					var c1 = saliencies[bidx] < .6f ? pixel : Color.FromArgb(a_pix, r_pix, g_pix, b_pix);
 					c2 = BlueNoise.Diffuse(c1, palette[qPixelIndex], kappa, strength, x, y);
 				}
 			}

nQuant.Master/PnnLABQuantizer.cs

@@ -126,9 +126,9 @@ private void Find_nn(Pnnbin[] bins, int idx, bool texicab)
 		protected override QuanFn GetQuanFn(int nMaxColors, short quan_rt) {
 			if (quan_rt > 0) {
 				if (quan_rt > 1)
-					return cnt => (int) Math.Pow(cnt, .75);
+					return cnt => (float) Math.Pow(cnt, .75);
 				if (nMaxColors < 64)
-					return cnt => (int)Math.Sqrt(cnt);
+					return cnt => (float)Math.Sqrt(cnt);
 
 				return cnt => (float)Math.Sqrt(cnt);
 			}
@@ -630,7 +630,7 @@ internal Bitmap QuantizeImage(int[] pixels, int bitmapWidth, int nMaxColors, boo
 			var bitmapHeight = pixels.Length / bitmapWidth;
 
 			var dest = new Bitmap(bitmapWidth, bitmapHeight, pixelFormat);
-			if(m_palette == null) {
+			if (m_palette == null) {
 				var palettes = dest.Palette.Entries;
 				if (palettes.Length != nMaxColors)
 					palettes = new Color[nMaxColors];
@@ -655,15 +655,6 @@ internal Bitmap QuantizeImage(int[] pixels, int bitmapWidth, int nMaxColors, boo
 
 			var qPixels = Dither(pixels, m_palette, bitmapWidth, bitmapHeight, dither);
 
-			if (HasAlpha && nMaxColors <= 256)
-			{
-				var k = qPixels[m_transparentPixelIndex];
-				if (nMaxColors > 2)
-					m_palette[k] = m_transparentColor;
-				else if (m_palette[k] != m_transparentColor)
-					BitmapUtilities.Swap(ref m_palette[0], ref m_palette[1]);
-			}
-
 			if (nMaxColors > 256)
 				return BitmapUtilities.ProcessImagePixels(dest, qPixels, hasSemiTransparency, m_transparentPixelIndex);
 

nQuant.Master/PnnQuantizer.cs

@@ -475,14 +475,6 @@ public Bitmap QuantizeImage(Bitmap source, PixelFormat pixelFormat, int nMaxColo
 
 			var qPixels = Dither(pixels, m_palette, bitmapWidth, bitmapHeight, dither);
 
-			if (HasAlpha && nMaxColors <= 256)
-			{
-				var k = qPixels[m_transparentPixelIndex];
-				if (nMaxColors > 2)
-					m_palette[k] = m_transparentColor;
-				else if (m_palette[k] != m_transparentColor)
-					BitmapUtilities.Swap(ref m_palette[0], ref m_palette[1]);
-			}
 			closestMap.Clear();
 			nearestMap.Clear();