Version 2.032

24.04.24 Rebuild x86/x64 VS2022/MT for release Version 2.032
leadedge · May 24, 2024 · 78c85d8 · 78c85d8
1 parent c64b5bf
commit 78c85d8
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 5 deletions.
diff --git a/SpoutDX/source/SpoutCommon.h b/SpoutDX/source/SpoutCommon.h
@@ -8,6 +8,7 @@
 // Optional _#define legacyOpenGL_ to enable legacy draw functions
 //
 
+
 /*
 		Thanks and credit to Malcolm Bechard, the author of this file
 		https://github.com/mbechard

diff --git a/SpoutDX/source/SpoutCopy.cpp b/SpoutDX/source/SpoutCopy.cpp
@@ -1,5 +1,6 @@
 /*
 
+
 	Functions to manage pixel data copy
 
 	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

diff --git a/SpoutDX/source/SpoutCopy.h b/SpoutDX/source/SpoutCopy.h
@@ -1,5 +1,6 @@
 /*
 
+
 					SpoutCopy.h
 
 		Functions to manage pixel buffer copying

diff --git a/SpoutDX/source/SpoutDX.cpp b/SpoutDX/source/SpoutDX.cpp
@@ -1,4 +1,5 @@
 //
+//
 //			SpoutDX
 //
 //		Sender and receiver for DirectX applications

diff --git a/SpoutDX/source/SpoutDX.h b/SpoutDX/source/SpoutDX.h
@@ -1,5 +1,6 @@
 /*
 
+
 			SpoutDX.h
 
 			Sender and receiver for DirectX applications

diff --git a/SpoutDX/source/SpoutDirectX.cpp b/SpoutDX/source/SpoutDirectX.cpp
@@ -2,6 +2,7 @@
 //
 //			spoutDirectX.cpp
 //
+//
 //		Functions to manage DirectX11 texture sharing
 //
 // ====================================================================================

diff --git a/SpoutDX/source/SpoutDirectX.h b/SpoutDX/source/SpoutDirectX.h
@@ -1,5 +1,6 @@
 /*
 
+
 	spoutDirectX.h
 
 	Functions to manage DirectX 11 texture sharing

diff --git a/SpoutDX/source/SpoutFrameCount.cpp b/SpoutDX/source/SpoutFrameCount.cpp
@@ -1,4 +1,5 @@
 //
+//
 //		SpoutFrameCount
 //
 //		Semaphore frame counter

diff --git a/SpoutDX/source/SpoutFrameCount.h b/SpoutDX/source/SpoutFrameCount.h
@@ -1,5 +1,6 @@
 /*
 
+
 					SpoutFrameCount.h
 
 				Frame counting management

diff --git a/SpoutDX/source/SpoutSenderNames.cpp b/SpoutDX/source/SpoutSenderNames.cpp
@@ -1,5 +1,6 @@
 /*
 
+
 	SpoutSenderNames.cpp
 
 	Spout sender management

diff --git a/SpoutDX/source/SpoutSenderNames.h b/SpoutDX/source/SpoutSenderNames.h
@@ -1,5 +1,6 @@
 /*
 
+
 	spoutSenderNames.h
 
 	Spout sender management

diff --git a/SpoutDX/source/SpoutSharedMemory.cpp b/SpoutDX/source/SpoutSharedMemory.cpp
@@ -1,5 +1,6 @@
 /**
 
+
 	http://www.codeproject.com/Articles/835818/Ultimate-Shared-Memory-A-flexible-class-for-interp
 
 	SpoutSharedMemory.cpp

diff --git a/SpoutDX/source/SpoutSharedMemory.h b/SpoutDX/source/SpoutSharedMemory.h
@@ -1,5 +1,6 @@
 /*
 
+
 	SpoutSharedMemory.h
 	
 	Thanks and credit to Malcolm Bechard the author of this class

diff --git a/SpoutDX/source/SpoutUtils.cpp b/SpoutDX/source/SpoutUtils.cpp
@@ -1,5 +1,6 @@
 /*
 
+
 			SpoutUtils
 
 			Utility functions
@@ -2122,7 +2123,7 @@ namespace spoututils {
 
 					// Add combo box items
 					if (comboitems.size() > 0) {
-						for (int i = 0; i<comboitems.size(); i++) {
+						for (int i = 0; i<(int)comboitems.size(); i++) {
 							SendMessageA(hCombo, (UINT)CB_ADDSTRING, (WPARAM)0, (LPARAM)comboitems[i].c_str());
 						}
 						// Display an initial item in the selection field

diff --git a/SpoutDX/source/SpoutUtils.h b/SpoutDX/source/SpoutUtils.h
@@ -1,5 +1,6 @@
 /*
 
+
 						SpoutUtils.h
 
 					General utility functions

diff --git a/binaries/SPOUTCAM/SpoutCam32/SpoutCam32.ax b/binaries/SPOUTCAM/SpoutCam32/SpoutCam32.ax
diff --git a/binaries/SPOUTCAM/SpoutCam64/SpoutCam64.ax b/binaries/SPOUTCAM/SpoutCam64/SpoutCam64.ax
diff --git a/lib/x64/Debug/SpoutDX.idb b/lib/x64/Debug/SpoutDX.idb
diff --git a/source/cam.cpp b/source/cam.cpp
@@ -309,9 +309,9 @@
 	30.12.23   Rebuild x86/x64 VS2022/MT for release
 			   Version 2.031
 	09.01.24   SpoutDX::ReadPixelData wait for command completion using FlushWait
-			   Version 2.032
 	23.05.24   SpoutDX::ReadPixelData - RGBA and BGRA texture data to BGR pixels default, RGB for swap
-			   Version 2.033
+	24.04.24   Rebuild x86/x64 VS2022/MT for release
+			   Version 2.032
 
 */
 
@@ -342,7 +342,7 @@ CUnknown * WINAPI CVCam::CreateInstance(LPUNKNOWN lpunk, HRESULT *phr)
 	// Console window
 	// OpenSpoutConsole(); // Empty console
 	// EnableSpoutLog(); // Show error logs
-	// EnableSpoutLogFile("SpoutCamDX_2023");
+	// EnableSpoutLogFile("SpoutCamDX_2022");
 	// SpoutLog("SpoutCamDX ~ Vers 2.032\n");
 
 	// For clear options dialog for scaled display
@@ -702,6 +702,7 @@ void CVCamStream::SetFps(DWORD dwFps)
 
 void CVCamStream::SetResolution(DWORD dwResolution)
 {
+
 	switch(dwResolution) {
 
 		//<==================== VS-START ====================>
@@ -716,6 +717,7 @@ void CVCamStream::SetResolution(DWORD dwResolution)
 					unsigned int width, height;
 					HANDLE sharehandle;
 					DWORD format;
+
 					if (receiver.GetSenderInfo(g_SenderName, width, height, sharehandle, format))
 					{
 						// If not fixed to the a selected resolution, use the sender width and height

diff --git a/source/version.h b/source/version.h
@@ -9,7 +9,7 @@
 #define _VER_MAJORVERSION_STRING L"2"
 
 #define _VER_MINORVERSION 1
-#define _VER_MINORVERSION_STRING L"033"     
+#define _VER_MINORVERSION_STRING L"032"     
 
 #define _VER_BUGFIXVERSION 0
 #define _VER_BUGFIXVERSION_STRING L"0"