[vlc-commits] commit: Removes three compile warnings by casting (Sasha Koruga )
git at videolan.org
git at videolan.org
Sun Aug 15 01:21:21 CEST 2010
vlc | branch: master | Sasha Koruga <skoruga at gmail.com> | Sat Aug 14 14:45:41 2010 -0700| [7603d934120130d1ae541586bc15336f91016c43] | committer: Jean-Baptiste Kempf
Removes three compile warnings by casting
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7603d934120130d1ae541586bc15336f91016c43
---
modules/video_output/msw/direct3d.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 4fd89e0..eb81ebb 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -514,9 +514,9 @@ static int Direct3DFillPresentationParameters(vout_display_t *vd)
d3dpp->Flags = D3DPRESENTFLAG_VIDEO;
d3dpp->Windowed = TRUE;
d3dpp->hDeviceWindow = vd->sys->hvideownd;
- d3dpp->BackBufferWidth = __MAX(GetSystemMetrics(SM_CXVIRTUALSCREEN),
+ d3dpp->BackBufferWidth = __MAX((unsigned int)GetSystemMetrics(SM_CXVIRTUALSCREEN),
d3ddm.Width);
- d3dpp->BackBufferHeight = __MAX(GetSystemMetrics(SM_CYVIRTUALSCREEN),
+ d3dpp->BackBufferHeight = __MAX((unsigned int)GetSystemMetrics(SM_CYVIRTUALSCREEN),
d3ddm.Height);
d3dpp->SwapEffect = D3DSWAPEFFECT_COPY;
d3dpp->MultiSampleType = D3DMULTISAMPLE_NONE;
@@ -1069,7 +1069,7 @@ static void Direct3DRenderScene(vout_display_t *vd, LPDIRECT3DSURFACE9 surface)
/* Update the vertex buffer */
CUSTOMVERTEX *vertices;
- hr = IDirect3DVertexBuffer9_Lock(d3dvtc, 0, 0, &vertices, D3DLOCK_DISCARD);
+ hr = IDirect3DVertexBuffer9_Lock(d3dvtc, 0, 0, (void **)&vertices, D3DLOCK_DISCARD);
if (FAILED(hr)) {
msg_Dbg(vd, "%s:%d (hr=0x%0lX)", __FUNCTION__, __LINE__, hr);
return;
More information about the vlc-commits
mailing list