Просмотр исходного кода

win-capture: explicitly cast function pointers

This solves invalid conversions when building with gcc
martell 11 лет назад
Родитель
Сommit
c5478f52d9

+ 5 - 5
plugins/win-capture/graphics-hook/d3d9-capture.cpp

@@ -773,15 +773,15 @@ bool hook_d3d9(void)
 	reset_ex_addr = get_offset_addr(d3d9_module,
 			global_hook_info->offsets.d3d9.reset_ex);
 
-	hook_init(&present, present_addr, hook_present,
+	hook_init(&present, present_addr, (void*)hook_present,
 			"IDirect3DDevice9::Present");
-	hook_init(&present_ex, present_ex_addr, hook_present_ex,
+	hook_init(&present_ex, present_ex_addr, (void*)hook_present_ex,
 			"IDirect3DDevice9Ex::PresentEx");
-	hook_init(&present_swap, present_swap_addr, hook_present_swap,
+	hook_init(&present_swap, present_swap_addr, (void*)hook_present_swap,
 			"IDirect3DSwapChain9::Present");
-	hook_init(&reset, reset_addr, hook_reset,
+	hook_init(&reset, reset_addr, (void*)hook_reset,
 			"IDirect3DDevice9::Reset");
-	hook_init(&reset_ex, reset_ex_addr, hook_reset_ex,
+	hook_init(&reset_ex, reset_ex_addr, (void*)hook_reset_ex,
 			"IDirect3DDevice9Ex::ResetEx");
 
 	rehook(&reset_ex);

+ 2 - 2
plugins/win-capture/graphics-hook/dxgi-capture.cpp

@@ -217,9 +217,9 @@ bool hook_dxgi(void)
 	resize_addr = get_offset_addr(dxgi_module,
 			global_hook_info->offsets.dxgi.resize);
 
-	hook_init(&present, present_addr, hook_present,
+	hook_init(&present, present_addr, (void*)hook_present,
 			"IDXGISwapChain::Present");
-	hook_init(&resize_buffers, resize_addr, hook_resize_buffers,
+	hook_init(&resize_buffers, resize_addr, (void*)hook_resize_buffers,
 			"IDXGISwapChain::ResizeBuffers");
 
 	rehook(&resize_buffers);