Merge branch 'master' into fork-master

cwoffenden · Apr 4, 2020 · 8a25ba0 · 8a25ba0
2 parents a8d92f7 + 4bbd743
commit 8a25ba0
Showing 1 changed file with 34 additions and 8 deletions.
diff --git a/src/Samples/PsdSamples.cpp b/src/Samples/PsdSamples.cpp
@@ -204,13 +204,31 @@ namespace
 
 // ---------------------------------------------------------------------------------------------------------------------
 // ---------------------------------------------------------------------------------------------------------------------
-int SampleReadPsd(void)
+static std::wstring GetSampleInputPath(void)
 {
-#if PSD_USE_MSVC
-	const std::wstring srcPath = L"..\\..\\bin\\Sample.psd";
-#else
-    const std::wstring srcPath = L"/Users/oluseyi/Projects/psd_sdk/bin/Sample.psd";
+	// TODO: add support for other platforms
+#ifdef _WIN32
+	return L"../../bin/";
+#endif
+}
+
+
+// ---------------------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------------------------------------------------
+static std::wstring GetSampleOutputPath(void)
+{
+	// TODO: add support for other platforms
+#ifdef _WIN32
+	return L"../../bin/";
 #endif
+}
+
+
+// ---------------------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------------------------------------------------
+int SampleReadPsd(void)
+{
+	const std::wstring srcPath = GetSampleInputPath() + L"Sample.psd";
 
 	MallocAllocator allocator;
 	NativeFile file(&allocator);
@@ -355,6 +373,7 @@ int SampleReadPsd(void)
 				if (document->bitsPerChannel == 8u)
 				{
 					std::wstringstream filename;
+					filename << GetSampleOutputPath();
 					filename << L"layer";
 					filename << layerName.str();
 					filename << L".tga";
@@ -366,6 +385,7 @@ int SampleReadPsd(void)
 				if (document->bitsPerChannel == 8u)
 				{
 					std::wstringstream filename;
+					filename << GetSampleOutputPath();
 					filename << L"layer";
 					filename << layerName.str();
 					filename << L".tga";
@@ -390,6 +410,7 @@ int SampleReadPsd(void)
 				void* maskData = layer->layerMask->data;
 				{
 					std::wstringstream filename;
+					filename << GetSampleOutputPath();
 					filename << L"layer";
 					filename << layerName.str();
 					filename << L"_usermask.tga";
@@ -400,6 +421,7 @@ int SampleReadPsd(void)
 				void* maskCanvasData = ExpandMaskToCanvas(document, &allocator, layer->layerMask);
 				{
 					std::wstringstream filename;
+					filename << GetSampleOutputPath();
 					filename << L"canvas";
 					filename << layerName.str();
 					filename << L"_usermask.tga";
@@ -418,6 +440,7 @@ int SampleReadPsd(void)
 				void* maskData = layer->vectorMask->data;
 				{
 					std::wstringstream filename;
+					filename << GetSampleOutputPath();
 					filename << L"layer";
 					filename << layerName.str();
 					filename << L"_vectormask.tga";
@@ -427,6 +450,7 @@ int SampleReadPsd(void)
 				void* maskCanvasData = ExpandMaskToCanvas(document, &allocator, layer->vectorMask);
 				{
 					std::wstringstream filename;
+					filename << GetSampleOutputPath();
 					filename << L"canvas";
 					filename << layerName.str();
 					filename << L"_vectormask.tga";
@@ -516,6 +540,7 @@ int SampleReadPsd(void)
 			if (document->bitsPerChannel == 8)
 			{
 				std::wstringstream filename;
+				filename << GetSampleOutputPath();
 				filename << L"merged.tga";
 				if (isRgb)
 				{
@@ -547,6 +572,7 @@ int SampleReadPsd(void)
 					if (document->bitsPerChannel == 8)
 					{
 						std::wstringstream filename;
+						filename << GetSampleOutputPath();
 						filename << L"extra_channel_";
 						filename << channel->asciiName.c_str();
 						filename << L".tga";
@@ -577,7 +603,7 @@ int SampleWritePsd(void)
 	GenerateImageData();
 
 	{
-		const std::wstring dstPath = L"SampleWrite_8.psd";
+		const std::wstring dstPath = GetSampleOutputPath() + L"SampleWrite_8.psd";
 
 		MallocAllocator allocator;
 		NativeFile file(&allocator);
@@ -657,7 +683,7 @@ int SampleWritePsd(void)
 		file.Close();
 	}
 	{
-		const std::wstring dstPath = L"SampleWrite_16.psd";
+		const std::wstring dstPath = GetSampleOutputPath() + L"SampleWrite_16.psd";
 
 		MallocAllocator allocator;
 		NativeFile file(&allocator);
@@ -695,7 +721,7 @@ int SampleWritePsd(void)
 		file.Close();
 	}
 	{
-		const std::wstring dstPath = L"SampleWrite_32.psd";
+		const std::wstring dstPath = GetSampleOutputPath() + L"SampleWrite_32.psd";
 
 		MallocAllocator allocator;
 		NativeFile file(&allocator);