Commit ea88cefe authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Win32: remove "dereferencing type-punned pointer will break strict-aliasing...

Win32: remove "dereferencing type-punned pointer will break strict-aliasing rules" and bring "passing argument ... from incompatible pointer type

At least it compiles...
parent de688523
...@@ -1375,7 +1375,7 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1375,7 +1375,7 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic )
} }
/* Update the vertex buffer */ /* Update the vertex buffer */
hr = IDirect3DVertexBuffer9_Lock(p_d3dvtc, 0, 0, (VOID **)(&p_vertices), D3DLOCK_DISCARD); hr = IDirect3DVertexBuffer9_Lock(p_d3dvtc, 0, 0, (&p_vertices), D3DLOCK_DISCARD);
if( FAILED(hr) ) if( FAILED(hr) )
{ {
msg_Dbg( p_vout, "%s:%d (hr=0x%0lX)", __FUNCTION__, __LINE__, hr); msg_Dbg( p_vout, "%s:%d (hr=0x%0lX)", __FUNCTION__, __LINE__, hr);
......
...@@ -880,7 +880,7 @@ static int DirectXInitDDraw( vout_thread_t *p_vout ) ...@@ -880,7 +880,7 @@ static int DirectXInitDDraw( vout_thread_t *p_vout )
/* Get the IDirectDraw2 interface */ /* Get the IDirectDraw2 interface */
dxresult = IDirectDraw_QueryInterface( p_ddobject, &IID_IDirectDraw2, dxresult = IDirectDraw_QueryInterface( p_ddobject, &IID_IDirectDraw2,
(LPVOID *)&p_vout->p_sys->p_ddobject ); &p_vout->p_sys->p_ddobject );
/* Release the unused interface */ /* Release the unused interface */
IDirectDraw_Release( p_ddobject ); IDirectDraw_Release( p_ddobject );
if( dxresult != DD_OK ) if( dxresult != DD_OK )
...@@ -969,7 +969,7 @@ static int DirectXCreateDisplay( vout_thread_t *p_vout ) ...@@ -969,7 +969,7 @@ static int DirectXCreateDisplay( vout_thread_t *p_vout )
dxresult = IDirectDrawSurface_QueryInterface( p_display, dxresult = IDirectDrawSurface_QueryInterface( p_display,
&IID_IDirectDrawSurface2, &IID_IDirectDrawSurface2,
(LPVOID *)&p_vout->p_sys->p_display ); &p_vout->p_sys->p_display );
/* Release the old interface */ /* Release the old interface */
IDirectDrawSurface_Release( p_display ); IDirectDrawSurface_Release( p_display );
if ( dxresult != DD_OK ) if ( dxresult != DD_OK )
......
...@@ -802,7 +802,7 @@ static void InitBuffers( vout_thread_t *p_vout ) ...@@ -802,7 +802,7 @@ static void InitBuffers( vout_thread_t *p_vout )
p_vout->p_sys->off_bitmap = p_vout->p_sys->off_bitmap =
CreateDIBSection( window_dc, (BITMAPINFO *)p_header, DIB_RGB_COLORS, CreateDIBSection( window_dc, (BITMAPINFO *)p_header, DIB_RGB_COLORS,
(void**)&p_vout->p_sys->p_pic_buffer, NULL, 0 ); &p_vout->p_sys->p_pic_buffer, NULL, 0 );
p_vout->p_sys->off_dc = CreateCompatibleDC( window_dc ); p_vout->p_sys->off_dc = CreateCompatibleDC( window_dc );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment