- Rename "hash" so that there is no ambiguity with std::hash.

- Avoid a macro redefinition.
- Make some signed/unsigned conversions explicit.
- Fix a few unused variables.
- Reduce the scope of a few variables.
- Don't use extra class name qualificater in header files.
- Initilialize a few variables.
- Fix the case for some file names.
- Remove some useless casts.
- Cosmetics (remove empty lines at the end of some files, ...)

Patch by XhmikosR.

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3605 10f7b99b-c216-0410-bff0-8a66a9350fd8

8 files changed, 13 insertions, 13 deletions

diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
index c1fcb1af6..661203062 100644
--- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
+++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
@@ -1483,7 +1483,7 @@ HRESULT CMPCVideoDecFilter::SoftwareDecode(IMediaSample* pIn, BYTE* pDataIn, int
 

 		// Required number of additionally allocated bytes at the end of the input bitstream for decoding.

 		// This is mainly needed because some optimized bitstream readers read

-		// 32 or 64 bit at once and could read over the end.<br>

+		// 32 or 64 bit at once and could read over the end.

 		// Note: If the first 23 bits of the additional bytes are not 0, then damaged

 		// MPEG bitstreams could cause overread and segfault.

 		memcpy(m_pFFBuffer, pDataIn, nSize);

diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
index 273e16dec..e2fe314e5 100644
--- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
+++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
@@ -629,7 +629,7 @@ bool CMpeg2DecFilter::IsVideoInterlaced()
 

 void CMpeg2DecFilter::UpdateAspectRatio()

 {

-	if(m_bReadARFromStream && (m_par.cx != m_dec->m_info.m_sequence->pixel_width || m_par.cy != m_dec->m_info.m_sequence->pixel_height)) {

+	if (m_bReadARFromStream && ((unsigned int)m_par.cx != m_dec->m_info.m_sequence->pixel_width || (unsigned int)m_par.cy != m_dec->m_info.m_sequence->pixel_height)) {

 		m_par.cx = m_dec->m_info.m_sequence->pixel_width;

 		m_par.cy = m_dec->m_info.m_sequence->pixel_height;

 		CSize dar(m_dec->m_info.m_sequence->picture_width * m_par.cx,

diff --git a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp
index ef0df6c1d..365ece5ae 100644
--- a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp
+++ b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp
@@ -28,7 +28,7 @@
 #include "TextInputPin.h"

 #include "DirectVobSubPropPage.h"

 #include "VSFilter.h"

-#include "SysTray.h"

+#include "Systray.h"

 #include "../../../DSUtil/MediaTypes.h"

 #include "../../../SubPic/MemSubPic.h"

 #include "../../../SubPic/SubPicQueueImpl.h"

@@ -337,7 +337,7 @@ HRESULT CDirectVobSubFilter::JoinFilterGraph(IFilterGraph* pGraph, LPCWSTR pName
 			if(((ver >> 48)&0xffff) == 4 && ((ver >> 32)&0xffff) == 2) {

 				DWORD dwVersion = GetVersion();

 				DWORD dwWindowsMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));

-				DWORD dwWindowsMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion)));

+				//DWORD dwWindowsMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion)));

 

 				if(dwVersion < 0x80000000 && dwWindowsMajorVersion >= 5) {

 					AfxMessageBox(IDS_DIVX_WARNING);

diff --git a/src/filters/transform/VSFilter/Scale2x.cpp b/src/filters/transform/VSFilter/Scale2x.cpp
index f05773520..0bcdfa6dd 100644
--- a/src/filters/transform/VSFilter/Scale2x.cpp
+++ b/src/filters/transform/VSFilter/Scale2x.cpp
@@ -216,9 +216,9 @@ void Scale2x_YUY2( int w, int h, BYTE* d, int dpitch, BYTE* s, int spitch )
 #endif

 	//scale_func = Scale2x_YUY2_c;

 

-	unsigned __int64 __0xffffffff00000000 = 0xffffffff00000000;

-	unsigned __int64 __0x00000000ffffffff = 0x00000000ffffffff;

-	unsigned __int64 __0x00ff00ff00ff00ff = 0x00ff00ff00ff00ff;

+	//unsigned __int64 __0xffffffff00000000 = 0xffffffff00000000;

+	//unsigned __int64 __0x00000000ffffffff = 0x00000000ffffffff;

+	//unsigned __int64 __0x00ff00ff00ff00ff = 0x00ff00ff00ff00ff;

 

 	BYTE* s1;

 	BYTE* s2;

diff --git a/src/filters/transform/VSFilter/Systray.cpp b/src/filters/transform/VSFilter/Systray.cpp
index fa2bd5c2d..7ca6fdc16 100644
--- a/src/filters/transform/VSFilter/Systray.cpp
+++ b/src/filters/transform/VSFilter/Systray.cpp
@@ -408,7 +408,7 @@ DWORD CALLBACK SystrayThreadProc(void* pParam)
 static TCHAR* CallPPage(IFilterGraph* pGraph, int idx, HWND hWnd)

 {

 	int i = 0;

-	bool fFound = false;

+	//bool fFound = false;

 

 	WCHAR* wstr = NULL;

 	CComPtr<IBaseFilter> pFilter;

diff --git a/src/filters/transform/VSFilter/VSFilter.vcxproj b/src/filters/transform/VSFilter/VSFilter.vcxproj
index 5e206ad49..253e09e3f 100644
--- a/src/filters/transform/VSFilter/VSFilter.vcxproj
+++ b/src/filters/transform/VSFilter/VSFilter.vcxproj
@@ -195,7 +195,7 @@ update_version.bat
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Filter|x64'">Create</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="StyleEditorDialog.cpp" />

-    <ClCompile Include="systray.cpp" />

+    <ClCompile Include="Systray.cpp" />

     <ClCompile Include="TextInputPin.cpp" />

     <ClCompile Include="vfr.cpp" />

     <ClCompile Include="VSFilter.cpp" />

@@ -214,7 +214,7 @@ update_version.bat
     <ClInclude Include="Scale2x.h" />

     <ClInclude Include="stdafx.h" />

     <ClInclude Include="StyleEditorDialog.h" />

-    <ClInclude Include="systray.h" />

+    <ClInclude Include="Systray.h" />

     <ClInclude Include="TextInputPin.h" />

     <ClInclude Include="vfr.h" />

     <ClInclude Include="VSFilter.h" />

diff --git a/src/filters/transform/VSFilter/VSFilter.vcxproj.filters b/src/filters/transform/VSFilter/VSFilter.vcxproj.filters
index 8f6174497..6b0510a1a 100644
--- a/src/filters/transform/VSFilter/VSFilter.vcxproj.filters
+++ b/src/filters/transform/VSFilter/VSFilter.vcxproj.filters
@@ -45,7 +45,7 @@
     <ClCompile Include="StyleEditorDialog.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="systray.cpp">

+    <ClCompile Include="Systray.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="TextInputPin.cpp">

@@ -103,7 +103,7 @@
     <ClInclude Include="StyleEditorDialog.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="systray.h">

+    <ClInclude Include="Systray.h">

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="TextInputPin.h">

diff --git a/src/filters/transform/VSFilter/vfr.cpp b/src/filters/transform/VSFilter/vfr.cpp
index 3375dd645..1c43cd4d5 100644
--- a/src/filters/transform/VSFilter/vfr.cpp
+++ b/src/filters/transform/VSFilter/vfr.cpp
@@ -173,7 +173,7 @@ VFRTranslator *GetVFRTranslator(const char *vfrfile)
 	char buf[32];

 	buf[19] = 0; // In "# timecode format v1" the version number is character index 19

 	FILE *f;

-	errno_t err = fopen_s(&f, vfrfile, "r");

+	fopen_s(&f, vfrfile, "r"); // errno_t err = <-- TODO: Check if fopen fails

 	VFRTranslator *res = 0;

 	if (fgets(buf, 32, f) && buf[0] == '#') {

 		// So do some really shoddy parsing here, assume the file is good