Add files via upload

nQuantCpp/CIELABConvertor.h

@@ -1,4 +1,20 @@
 #pragma once
+#ifndef _WIN32
+	#include <guiddef.h>
+	#include <gdiplus.h>
+	using namespace Gdiplus;
+
+	#ifndef ARGB
+		typedef unsigned long ARGB;
+	#endif
+	#ifndef BYTE
+		typedef unsigned char BYTE;
+	#endif
+	#ifndef BYTE_MAX
+		#include <climits>
+		#define BYTE_MAX UCHAR_MAX
+	#endif
+#endif
 
 class CIELABConvertor
 {

nQuantCpp/DivQuantizer.cpp

@@ -16,7 +16,6 @@
 
 #include "stdafx.h"
 #include "DivQuantizer.h"
-#include "bitmapUtilities.h"
 #include "CIELABConvertor.h"
 #include "BlueNoise.h"
 #include <algorithm>

nQuantCpp/DivQuantizer.h

@@ -1,4 +1,6 @@
 #pragma once
+#include "bitmapUtilities.h"
+
 #include <memory>
 #include <vector>
 using namespace std;

nQuantCpp/Dl3Quantizer.cpp

@@ -42,7 +42,6 @@
 
 #include "stdafx.h"
 #include "Dl3Quantizer.h"
-#include "bitmapUtilities.h"
 #include "BlueNoise.h"
 #include <unordered_map>
 

nQuantCpp/Dl3Quantizer.h

@@ -1,7 +1,5 @@
 #pragma once
-#include <memory>
-#include <vector>
-using namespace std;
+#include "bitmapUtilities.h"
 
 namespace Dl3Quant
 {

nQuantCpp/EdgeAwareSQuantizer.cpp

@@ -25,7 +25,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "stdafx.h"
 #include "EdgeAwareSQuantizer.h"
 #include "MedianCut.h"
-#include "bitmapUtilities.h"
 #include "CIELABConvertor.h"
 #include "GilbertCurve.h"
 

nQuantCpp/EdgeAwareSQuantizer.h

@@ -1,8 +1,5 @@
 #pragma once
-#include <memory>
-#include <vector>
-
-using namespace std;
+#include "bitmapUtilities.h"
 
 namespace EdgeAwareSQuant
 {

nQuantCpp/MedianCut.cpp

@@ -31,7 +31,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "stdafx.h"
 #include "MedianCut.h"
-#include "bitmapUtilities.h"
 #include "CIELABConvertor.h"
 #include "BlueNoise.h"
 #include <unordered_map>

nQuantCpp/MedianCut.h

@@ -31,12 +31,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #pragma once
 #include <string>
-#include <memory>
-#include <vector>
 #include <limits>
 #include "EdgeAwareSQuantizer.h"
 
-using namespace std;
 using namespace EdgeAwareSQuant;
 
 //#define VITER_CACHE_LINE_GAP ((64+sizeof(viter_state)-1)/sizeof(viter_state))

nQuantCpp/MoDEQuantizer.cpp

@@ -9,7 +9,6 @@ Copyright (c) 2018 - 2021 Miller Cy Chan
 
 #include "stdafx.h"
 #include "MoDEQuantizer.h"
-#include "bitmapUtilities.h"
 #include <ctime>
 #include <iomanip>      // std::setprecision
 #include <unordered_map>

nQuantCpp/MoDEQuantizer.h

@@ -1,7 +1,5 @@
 #pragma once
-#include <memory>
-#include <vector>
-using namespace std;
+#include "bitmapUtilities.h"
 
 namespace MoDEQuant
 {

nQuantCpp/NeuQuantizer.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "NeuQuantizer.h"
-#include "bitmapUtilities.h"
 #include "CIELABConvertor.h"
 #include <unordered_map>
 

nQuantCpp/NeuQuantizer.h

@@ -1,7 +1,5 @@
 #pragma once
-#include <memory>
-#include <vector>
-using namespace std;
+#include "bitmapUtilities.h"
 
 namespace NeuralNet
 {

nQuantCpp/Otsu.cpp

@@ -5,7 +5,6 @@
 
 #include "stdafx.h"
 #include "Otsu.h"
-#include "bitmapUtilities.h"
 #include "GilbertCurve.h"
 #define _USE_MATH_DEFINES
 #include <math.h>

nQuantCpp/Otsu.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "bitmapUtilities.h"
 
 namespace OtsuThreshold
 {

nQuantCpp/PnnQuantizer.cpp

@@ -5,7 +5,6 @@ Copyright (c) 2018-2024 Miller Cy Chan
 
 #include "stdafx.h"
 #include "PnnQuantizer.h"
-#include "bitmapUtilities.h"
 #include "GilbertCurve.h"
 #include "BlueNoise.h"
 #include <unordered_map>

nQuantCpp/PnnQuantizer.h

@@ -1,7 +1,5 @@
 #pragma once
-#include <memory>
-#include <vector>
-using namespace std;
+#include "bitmapUtilities.h"
 
 namespace PnnQuant
 {

nQuantCpp/SpatialQuantizer.cpp

@@ -23,7 +23,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "stdafx.h"
 #include "SpatialQuantizer.h"
-#include "bitmapUtilities.h"
 #include "CIELABConvertor.h"
 #include "GilbertCurve.h"
 

nQuantCpp/SpatialQuantizer.h

@@ -1,7 +1,5 @@
 #pragma once
-#include <memory>
-#include <vector>
-using namespace std;
+#include "bitmapUtilities.h"
 
 namespace SpatialQuant
 {

nQuantCpp/WuQuantizer.cpp

@@ -21,7 +21,6 @@
 
 #include "stdafx.h"
 #include "WuQuantizer.h"
-#include "bitmapUtilities.h"
 #include "BlueNoise.h"
 #include <unordered_map>
 

nQuantCpp/WuQuantizer.h

@@ -1,7 +1,5 @@
 #pragma once
-#include <memory>
-#include <vector>
-using namespace std;
+#include "bitmapUtilities.h"
 
 // =============================================================
 // Quantizer objects and functions

nQuantCpp/bitmapUtilities.h

@@ -5,6 +5,14 @@
 #include <vector>
 using namespace std;
 
+#ifndef _WIN32
+	#include <guiddef.h>
+	#include <minwindef.h>
+	#include <gdiplus.h>
+	using namespace Gdiplus;
+#endif
+
+
 //////////////////////////////////////////////////////////////////////////
 //
 // GetBitmapHeaderSize

nQuantCpp/nQuantCpp.cpp

@@ -34,12 +34,6 @@ namespace fs = std::filesystem;
 #define new DEBUG_NEW
 #endif
 
-#ifdef UNICODE
-	auto& tcout = std::wcout;
-#else
-	auto& tcout = std::cout;
-#endif
-
 GdiplusStartupInput  m_gdiplusStartupInput;
 ULONG_PTR m_gdiplusToken;
 
@@ -48,19 +42,19 @@ unordered_map<LPCWSTR, CLSID> extensionMap;
 
 void PrintUsage()
 {
-	tcout << endl;
-	tcout << "usage: nQuantCpp <input image path> [options]" << endl;
-	tcout << endl;
-	tcout << "Valid options:" << endl;
-	tcout << "  /a : Algorithm used - Choose one of them, otherwise give you the defaults from [";
+	wcout << endl;
+	wcout << "usage: nQuantCpp <input image path> [options]" << endl;
+	wcout << endl;
+	wcout << "Valid options:" << endl;
+	wcout << "  /a : Algorithm used - Choose one of them, otherwise give you the defaults from [";
 	int i = 0;	
 	for(; i<sizeof(algs)/sizeof(string) - 1; ++i)
-		tcout << algs[i] << ", ";
-	tcout << algs[i] << "] ." << endl;
-	tcout << "  /m : Max Colors (pixel-depth) - Maximum number of colors for the output format to support. The default is 256 (8-bit)." << endl;
-	tcout << "  /d : Dithering or not? y or n." << endl;
-	tcout << "  /f : Frame delay in milliseconds for PNNLAB+ only." << endl;
-	tcout << "  /o : Output image file dir. The default is <source image path directory>" << endl;
+		wcout << algs[i] << ", ";
+	wcout << algs[i] << "] ." << endl;
+	wcout << "  /m : Max Colors (pixel-depth) - Maximum number of colors for the output format to support. The default is 256 (8-bit)." << endl;
+	wcout << "  /d : Dithering or not? y or n." << endl;
+	wcout << "  /f : Frame delay in milliseconds for PNNLAB+ only." << endl;
+	wcout << "  /o : Output image file dir. The default is <source image path directory>" << endl;
 }
 
 bool isdigit(const wchar_t* chars, const bool positiveOnly = true) {
@@ -175,9 +169,9 @@ bool OutputImage(const fs::path& sourcePath, const wstring& algorithm, const UIN
 	destPath += std::to_wstring(nMaxColors) + targetExtension;
 	auto status = pDest->Save(destPath.c_str(), &extensionMap[targetExtension]);
 	if (status == Status::Ok)
-		tcout << L"Converted image: " << destPath << endl;
+		wcout << L"Converted image: " << destPath << endl;
 	else
-		tcout << L"Failed to save image in '" << destPath << L"' file" << endl;
+		wcout << L"Failed to save image in '" << destPath << L"' file" << endl;
 
 	return status == Status::Ok;
 }
@@ -203,7 +197,7 @@ bool QuantizeImage(const wstring& algorithm, const wstring& sourceFile, wstring&
 		nQuantGA::APNsgaIII alg(pnnLABGAQuantizer);
 		alg.run(9999, -numeric_limits<double>::epsilon());
 		auto pGAq = alg.getResult();
-		tcout << L"\n" << pGAq->getResult().c_str() << endl;
+		wcout << L"\n" << pGAq->getResult().c_str() << endl;
 		vector<shared_ptr<Bitmap> > dests;
 		dests.emplace_back(pDest);
 		bSucceeded = pGAq->QuantizeImage(dests, dither);
@@ -287,7 +281,7 @@ static void OutputImages(const fs::path& sourceDir, wstring& targetDir, const UI
 				for (int i = 0; i < pSources.size(); ++i) {
 					ostringstream ss;
 					ss << "\r" << i << " of " << pSources.size() << " completed." << showpoint;
-					tcout << ss.str().c_str();
+					wcout << ss.str().c_str();
 
 					PnnLABQuant::PnnLABQuantizer pnnLABQuantizer;
 					pnnLABQuantizer.QuantizeImage(pSources[i].get(), pDests[i].get(), maxColors, dither);
@@ -300,20 +294,20 @@ static void OutputImages(const fs::path& sourceDir, wstring& targetDir, const UI
 				for (int i = 0; i < pSources.size(); ++i) {
 					ostringstream ss;
 					ss << "\r" << i << " of " << pSources.size() << " completed." << showpoint;
-					tcout << ss.str().c_str();
+					wcout << ss.str().c_str();
 
 					PnnQuant::PnnQuantizer pnnQuantizer;
 					pnnQuantizer.QuantizeImage(pSources[i].get(), pDests[i].get(), maxColors, dither);
 				}
 			}
-			tcout << L"\rWell done!!!                             " << endl;
+			wcout << L"\rWell done!!!                             " << endl;
 
 			GifEncode::GifWriter gifWriter(destPath, false, abs(delay));
 			auto status = gifWriter.AddImages(pDests);
 			if (status == Status::Ok)
-				tcout << L"Converted image: " << destPath << endl;
+				wcout << L"Converted image: " << destPath << endl;
 			else
-				tcout << L"Failed to save image in '" << destPath << L"' file" << endl;
+				wcout << L"Failed to save image in '" << destPath << L"' file" << endl;
 		}
 	}
 	else {
@@ -322,7 +316,7 @@ static void OutputImages(const fs::path& sourceDir, wstring& targetDir, const UI
 		nQuantGA::APNsgaIII alg(pnnLABGAQuantizer);
 		alg.run(9999, -numeric_limits<double>::epsilon());
 		auto pGAq = alg.getResult();
-		tcout << L"\n" << pGAq->getResult().c_str() << endl;
+		wcout << L"\n" << pGAq->getResult().c_str() << endl;
 		if (pGAq->QuantizeImage(pDests, dither)) {
 			if (nMaxColors > 256 || delay < 0) {
 				int i = 0;
@@ -339,18 +333,18 @@ static void OutputImages(const fs::path& sourceDir, wstring& targetDir, const UI
 				GifEncode::GifWriter gifWriter(destPath, pGAq->hasAlpha(), abs(delay));
 				auto status = gifWriter.AddImages(pDests);
 				if (status == Status::Ok)
-					tcout << L"Converted image: " << destPath << endl;
+					wcout << L"Converted image: " << destPath << endl;
 				else
-					tcout << L"Failed to save image in '" << destPath << L"' file" << endl;
+					wcout << L"Failed to save image in '" << destPath << L"' file" << endl;
 			}
 		}
 	}	
 
 	auto dur = chrono::duration_cast<chrono::microseconds>(chrono::steady_clock::now() - start).count() / 1000000.0;
-	tcout << "Completed in " << dur << " secs." << endl;
+	wcout << "Completed in " << dur << " secs." << endl;
 }
 
-int _tmain(int argc, _TCHAR** argv)
+int wmain(int argc, wchar_t** argv)
 {
 #ifdef _WIN32
 	_setmode(_fileno(stdout), _O_U16TEXT);
@@ -388,7 +382,7 @@ int _tmain(int argc, _TCHAR** argv)
 #endif
 
 	if(!fileExists(sourceFile)) {
-		tcout << "The source file you specified does not exist." << endl;
+		wcout << "The source file you specified does not exist." << endl;
 		return 0;
 	}		
 
@@ -432,10 +426,10 @@ int _tmain(int argc, _TCHAR** argv)
 				QuantizeImage(algo, sourceFile, targetDir, pSource, nMaxColors, dither);
 
 			auto dur = chrono::duration_cast<chrono::microseconds>(chrono::steady_clock::now() - start).count() / 1000000.0;
-			tcout << "Completed in " << dur << " secs." << endl;
+			wcout << "Completed in " << dur << " secs." << endl;
 		}
 		else
-			tcout << "Failed to read image in '" << sourceFile.c_str() << "' file";
+			wcout << "Failed to read image in '" << sourceFile.c_str() << "' file";
 	}
 	GdiplusShutdown(m_gdiplusToken);
 	return 0;

nQuantCpp/stdafx.h

@@ -4,11 +4,11 @@
 
 #define COM_NO_WINDOWS_H
 #define GDIPVER 0x0110 //Use more advanced GDI+ features
+#include <unknwn.h>				// Needed for non-MFC/ATL use
 
 #ifdef _WIN32
 	#pragma comment(lib, "gdiplus")
 
-	#include <unknwn.h>				// Needed for non-MFC/ATL use
 	#include <gdiplus.h>
 	using namespace Gdiplus;
 	#ifdef _WIN64
@@ -17,18 +17,15 @@
 		#pragma comment(linker, "\"/manifestdependency:type='Win32' name='Microsoft.Windows.GdiPlus' version='1.1.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'\"")
 	#endif
 #else
-	#include <shlobj.h>
+	#include <guiddef.h>
 	#include <gdiplus.h>
 	using namespace Gdiplus;
-	#ifndef BYTE
-		typedef unsigned char BYTE;
-	#endif
-	#ifndef UINT
-		typedef unsigned int UINT;
+
+	#ifndef LPCWSTR
+		typedef _Null_terminated_ CONST WCHAR* LPCWSTR, * PCWSTR;
 	#endif
 #endif
 
-
 #ifndef BYTE_MAX
 	#include <climits>
 	#define BYTE_MAX UCHAR_MAX