diff --git a/4J.Render/4J_Render.cpp b/4J.Render/4J_Render.cpp index 8bd80daa5..99b7879d6 100644 --- a/4J.Render/4J_Render.cpp +++ b/4J.Render/4J_Render.cpp @@ -695,7 +695,8 @@ HRESULT C4JRender::LoadTextureData(const char* szFilename, return hr; } -HRESULT C4JRender::LoadTextureData(BYTE* pbData, DWORD dwBytes, +HRESULT C4JRender::LoadTextureData(std::uint8_t* pbData, + std::uint32_t dwBytes, D3DXIMAGE_INFO* pSrcInfo, int** ppDataOut) { int width, height, channels; diff --git a/4J.Render/4J_Render.h b/4J.Render/4J_Render.h index bf8a4c6c1..05a43958b 100644 --- a/4J.Render/4J_Render.h +++ b/4J.Render/4J_Render.h @@ -30,10 +30,10 @@ typedef struct { } D3DXIMAGE_INFO; typedef struct _XSOCIAL_PREVIEWIMAGE { - BYTE* pBytes; - DWORD Pitch; - DWORD Width; - DWORD Height; + std::uint8_t* pBytes; + std::uint32_t Pitch; + std::uint32_t Width; + std::uint32_t Height; // D3DFORMAT Format; } XSOCIAL_PREVIEWIMAGE, *PXSOCIAL_PREVIEWIMAGE; @@ -171,7 +171,7 @@ public: void TextureDynamicUpdateEnd(); HRESULT LoadTextureData(const char* szFilename, D3DXIMAGE_INFO* pSrcInfo, int** ppDataOut); - HRESULT LoadTextureData(BYTE* pbData, DWORD dwBytes, + HRESULT LoadTextureData(std::uint8_t* pbData, std::uint32_t dwBytes, D3DXIMAGE_INFO* pSrcInfo, int** ppDataOut); HRESULT SaveTextureData(const char* szFilename, D3DXIMAGE_INFO* pSrcInfo, int* ppDataOut);