Add files via upload

Author: mcychan

nQuant.Master/GilbertCurve.cs

@@ -273,12 +273,9 @@ private void DiffusePixel(int x, int y)
 
 			if (unaccepted) {
 				if (saliencies != null)
-					qPixels[bidx] = DitherPixel(x, y, c2, 1.25f);
-				else if (CIELABConvertor.Y_Diff(pixel, c2) > 3 && CIELABConvertor.U_Diff(pixel, c2) > 3) {
-					var strength = 1 / 3f;
-					c2 = BlueNoise.Diffuse(pixel, palette[qPixels[bidx]], strength, strength, x, y);
-					qPixels[bidx] = ditherable.DitherColorIndex(palette, c2.ToArgb(), bidx);
-				}
+					qPixels[bidx] = DitherPixel(x, y, c2, beta);
+				else if (CIELABConvertor.Y_Diff(pixel, c2) > 3 && CIELABConvertor.U_Diff(pixel, c2) > 3)
+                    qPixels[bidx] = DitherPixel(x, y, c2, 1.25f);
 
 				if (palette.Length > 256) {
 					c2 = palette[qPixels[bidx]];

nQuant.Master/PnnLABQuantizer.cs

@@ -347,7 +347,8 @@ internal override void Pnnquan(int[] pixels, ref Color[] palettes, ref int nMaxC
 
 		internal override ushort NearestColorIndex(Color[] palette, int pixel, int pos)
 		{
-            int offset = GetColorIndex(pixel);
+            var nMaxColors = palette.Length;
+            int offset = nMaxColors > 32 ? pixel : GetColorIndex(pixel);
             if (nearestMap.TryGetValue(offset, out var k))
 				return k;
 
@@ -358,7 +359,6 @@ internal override ushort NearestColorIndex(Color[] palette, int pixel, int pos)
 				k = 1;
 
 			double mindist = 1e100;
-			var nMaxColors = palette.Length;
 			GetLab(pixel, out var lab1);
 
 			for (int i = k; i < nMaxColors; ++i)
@@ -427,14 +427,14 @@ internal override ushort NearestColorIndex(Color[] palette, int pixel, int pos)
 
 		internal ushort HybridColorIndex(Color[] palette, int pixel, int pos)
 		{
-            int offset = GetColorIndex(pixel);
+            var nMaxColors = palette.Length;
+            int offset = nMaxColors > 32 ? pixel : GetColorIndex(pixel);
             if (nearestMap.TryGetValue(offset, out var k))
 				return k;
 
 			var c = Color.FromArgb(pixel);
 
 			double mindist = int.MaxValue;
-			var nMaxColors = palette.Length;
 			GetLab(pixel, out var lab1);
 
 			for (int i = k; i < nMaxColors; ++i)
@@ -493,13 +493,13 @@ protected override ushort ClosestColorIndex(Color[] palette, int pixel, int pos)
 			if (c.A <= alphaThreshold)
 				return NearestColorIndex(palette, pixel, pos);
 
-            int offset = GetColorIndex(pixel);
+            var nMaxColors = palette.Length;
+            int offset = nMaxColors > 32 ? pixel : GetColorIndex(pixel);
             if (!closestMap.TryGetValue(offset, out var closest))
 			{
 				closest = new ushort[4];
 				closest[2] = closest[3] = ushort.MaxValue;
 
-				var nMaxColors = palette.Length;
 				for (ushort k = 0; k < nMaxColors; ++k)
 				{
 					var c2 = palette[k];

nQuant.Master/PnnQuantizer.cs

@@ -280,8 +280,9 @@ internal virtual void Pnnquan(int[] pixels, ref Color[] palettes, ref int nMaxCo
 			}
 		}
 		internal virtual ushort NearestColorIndex(Color[] palette, int pixel, int pos)
-		{
-            int offset = GetColorIndex(pixel);
+		{
+            var nMaxColors = palette.Length;
+            int offset = nMaxColors > 32 ? pixel : GetColorIndex(pixel);
             if (nearestMap.TryGetValue(offset, out var k))
 				return k;
 
@@ -296,7 +297,6 @@ internal virtual ushort NearestColorIndex(Color[] palette, int pixel, int pos)
 				pr = pg = pb = pa = 1;
 
 			double mindist = int.MaxValue;
-			var nMaxColors = palette.Length;
 			for (int i = k; i < nMaxColors; ++i)
 			{
 				var c2 = palette[i];
@@ -330,7 +330,8 @@ protected virtual ushort ClosestColorIndex(Color[] palette, int pixel, int pos)
 			if (c.A <= alphaThreshold)
 				return NearestColorIndex(palette, pixel, pos);
 
-            int offset = GetColorIndex(pixel);
+            var nMaxColors = palette.Length;
+            int offset = nMaxColors > 32 ? pixel : GetColorIndex(pixel);
             if (!closestMap.TryGetValue(offset, out var closest))
 			{
 				closest = new ushort[4];
@@ -339,8 +340,7 @@ protected virtual ushort ClosestColorIndex(Color[] palette, int pixel, int pos)
 				double pr = PR, pg = PG, pb = PB, pa = PA;
 				if(palette.Length < 3)
 					pr = pg = pb = pa = 1;
-
-				var nMaxColors = palette.Length;
+				
 				for (; k < nMaxColors; ++k)
 				{
 					var c2 = palette[k];