Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Michajłow <kasper93@gmail.com>2017-08-22 02:34:51 +0300
committerKacper Michajłow <kasper93@gmail.com>2017-08-28 00:14:49 +0300
commitbd7ab544e727bd1256ecd2f8953674ea405f1b28 (patch)
tree8ccaa41e0d5bb5aeb1911db528293e394b647c68
parentf57a6dc1a57fdbf37b4d2b4be02823ae3d8c421e (diff)
Fix some compilation warnings.
-rw-r--r--src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp4
-rw-r--r--src/filters/renderer/VideoRenderers/SyncRenderer.cpp2
-rw-r--r--src/filters/transform/VSFilter/plugins.cpp2
-rw-r--r--src/thirdparty/VirtualDub/h/vd2/system/vdstl_hash.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp
index c350d92df..7ddf3c347 100644
--- a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp
+++ b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp
@@ -1,5 +1,5 @@
/*
- * (C) 2006-2015 see Authors.txt
+ * (C) 2006-2015, 2017 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -58,7 +58,7 @@ static void AdjustQuad(MYD3DVERTEX<texcoords>* v, double dx, double dy)
v[i].t[j].v -= (float)(offset * dy);
}
- if (texcoords > 1) {
+ if constexpr (texcoords > 1) {
v[i].t[texcoords - 1].u -= offset;
v[i].t[texcoords - 1].v -= offset;
}
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
index ef8a2363e..c3ef870ca 100644
--- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
+++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
@@ -274,7 +274,7 @@ void CBaseAP::AdjustQuad(MYD3DVERTEX<texcoords>* v, double dx, double dy)
v[i].t[j].v -= (float)(offset * dy);
}
- if (texcoords > 1) {
+ if constexpr (texcoords > 1) {
v[i].t[texcoords - 1].u -= offset;
v[i].t[texcoords - 1].v -= offset;
}
diff --git a/src/filters/transform/VSFilter/plugins.cpp b/src/filters/transform/VSFilter/plugins.cpp
index 430179ea6..bb5c60449 100644
--- a/src/filters/transform/VSFilter/plugins.cpp
+++ b/src/filters/transform/VSFilter/plugins.cpp
@@ -524,7 +524,7 @@ namespace Plugin
dst.w = fa->src.w;
dst.h = fa->src.h;
dst.bpp = 32;
- dst.pitch = fa->src.pitch;
+ dst.pitch = int(fa->src.pitch);
dst.bits = (BYTE*)fa->src.data;
Render(dst, 10000i64 * fa->pfsi->lSourceFrameMS, 1000.0f / fa->pfsi->lMicrosecsPerFrame);
diff --git a/src/thirdparty/VirtualDub/h/vd2/system/vdstl_hash.h b/src/thirdparty/VirtualDub/h/vd2/system/vdstl_hash.h
index 28f1f673e..e7ad59dd5 100644
--- a/src/thirdparty/VirtualDub/h/vd2/system/vdstl_hash.h
+++ b/src/thirdparty/VirtualDub/h/vd2/system/vdstl_hash.h
@@ -84,7 +84,7 @@ template<> struct vdhash<double> {
if (i == 0x8000000000000000ULL)
i = 0;
- if (sizeof(size_t) < 8)
+ if constexpr (sizeof(size_t) < 8)
return (size_t)((i >> 32) ^ i);
else
return (size_t)i;