Matteo Bruni : d3dx9: Fix argument type in convert_dib_to_bmp().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8bed853c4380ebf86220ffe2fd89d48d98a90921
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8bed853c4380ebf86220ffe2f...

Author: Matteo Bruni 
Date:   Thu Apr  4 16:56:03 2019 +0200

d3dx9: Fix argument type in convert_dib_to_bmp().

Signed-off-by: Matteo Bruni 
Signed-off-by: Alexandre Julliard

---

dlls/d3dx9_36/surface.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index cf8286e..c82c222 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -770,7 +770,7 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, co
     return D3D_OK;
 }

-static BOOL convert_dib_to_bmp(void **data, UINT *size)
+static BOOL convert_dib_to_bmp(const void **data, unsigned int *size)
 {
     ULONG header_size;
     ULONG count = 0;
@@ -878,7 +878,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize,
     }

/* In case of DIB file, convert it to BMP */
-    dib = convert_dib_to_bmp((void**)&data, &datasize);
+    dib = convert_dib_to_bmp(&data, &datasize);

hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory);

@@ -1154,7 +1154,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface,
     }

if (imginfo.ImageFileFormat == D3DXIFF_DIB)
-        convert_dib_to_bmp((void**)&pSrcData, &SrcDataSize);
+        convert_dib_to_bmp(&pSrcData, &SrcDataSize);

if (FAILED(WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory)))
         goto cleanup_err;