Add files via upload

Author: mcychan

nQuantCpp/GilbertCurve.cpp

@@ -257,7 +257,7 @@ namespace Peano
 
 		if (unaccepted) {
 			if (m_saliencies != nullptr)
-				qPixelIndex = ditherPixel(x, y, c2, 1.25f);
+				qPixelIndex = ditherPixel(x, y, c2, beta);
 			else if (CIELABConvertor::Y_Diff(pixel, c2) > 3 && CIELABConvertor::U_Diff(pixel, c2) > 3) {
 				auto strength = 1 / 3.0f;
 				c2 = BlueNoise::diffuse(pixel, m_pPalette[qPixelIndex], strength, strength, x, y);

nQuantCpp/PnnLABQuantizer.cpp

@@ -334,7 +334,7 @@ namespace PnnLABQuant
 
 	unsigned short PnnLABQuantizer::nearestColorIndex(const ARGB* pPalette, const UINT nMaxColors, ARGB argb, const UINT pos)
 	{
-		int offset = GetARGBIndex(argb, hasSemiTransparency, hasAlpha());
+		int offset = nMaxColors > 32 ? argb : GetARGBIndex(argb, hasSemiTransparency, hasAlpha());
 		auto got = nearestMap.find(offset);
 		if (got != nearestMap.end())
 			return got->second;
@@ -424,7 +424,7 @@ namespace PnnLABQuant
 
 	unsigned short PnnLABQuantizer::hybridColorIndex(const ARGB* pPalette, const UINT nMaxColors, ARGB argb, const UINT pos)
 	{
-		int offset = GetARGBIndex(argb, hasSemiTransparency, hasAlpha());
+		int offset = nMaxColors > 32 ? argb : GetARGBIndex(argb, hasSemiTransparency, hasAlpha());
 		auto got = nearestMap.find(offset);
 		if (got != nearestMap.end())
 			return got->second;
@@ -491,7 +491,7 @@ namespace PnnLABQuant
 			return nearestColorIndex(pPalette, nMaxColors, argb, pos);
 
 		vector<unsigned short> closest(4);
-		int offset = GetARGBIndex(argb, hasSemiTransparency, hasAlpha());
+		int offset = nMaxColors > 32 ? argb : GetARGBIndex(argb, hasSemiTransparency, hasAlpha());
 		auto got = closestMap.find(offset);
 		if (got == closestMap.end()) {
 			closest[2] = closest[3] = USHRT_MAX;

nQuantCpp/PnnQuantizer.cpp

@@ -246,7 +246,7 @@ namespace PnnQuant
 
 	unsigned short nearestColorIndex(const ARGB* pPalette, const UINT nMaxColors, ARGB argb, const UINT pos)
 	{
-		int offset = GetARGBIndex(argb, hasSemiTransparency, m_transparentPixelIndex >= 0);
+		int offset = nMaxColors > 32 ? argb : GetARGBIndex(argb, hasSemiTransparency, m_transparentPixelIndex >= 0);
 		auto got = nearestMap.find(offset);
 		if (got != nearestMap.end())
 			return got->second;
@@ -297,7 +297,7 @@ namespace PnnQuant
 			return nearestColorIndex(pPalette, nMaxColors, argb, pos);
 
 		vector<unsigned short> closest(4);
-		int offset = GetARGBIndex(argb, hasSemiTransparency, m_transparentPixelIndex >= 0);
+		int offset = nMaxColors > 32 ? argb : GetARGBIndex(argb, hasSemiTransparency, m_transparentPixelIndex >= 0);
 		auto got = closestMap.find(offset);
 		if (got == closestMap.end()) {
 			closest[2] = closest[3] = USHRT_MAX;